diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild
index abc9fe39e986..f7e608e5bbfa 100644
--- a/app-admin/puppet/puppet-3.8.7-r1.ebuild
+++ b/app-admin/puppet/puppet-3.8.7-r1.ebuild
@@ -176,12 +176,15 @@ pkg_postinst() {
 		elog
 	fi
 
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		elog
-		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
-		elog "http://docs.puppetlabs.com/guides/upgrading.html"
-		elog
-	fi
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "2" ]; then
+			elog
+			elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+			elog "http://docs.puppetlabs.com/guides/upgrading.html"
+			elog
+		fi
+	done
 
 	use emacs && elisp-site-regen
 	use xemacs && xemacs-elisp-site-regen
diff --git a/app-admin/puppet/puppet-4.10.1.ebuild b/app-admin/puppet/puppet-4.10.1.ebuild
index 4f580f69e6f1..77b1ce4bfcd7 100644
--- a/app-admin/puppet/puppet-4.10.1.ebuild
+++ b/app-admin/puppet/puppet-4.10.1.ebuild
@@ -160,16 +160,19 @@ pkg_postinst() {
 	elog "http://forge.puppetlabs.com/gentoo/portage"
 	elog
 
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-		elog
-		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-		elog "/etc/puppetlabs/puppet"
-		elog "Also, puppet now uses config directories for modules and manifests."
-		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-		elog "for more information."
-		elog
-	fi
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
 
 	use emacs && elisp-site-regen
 	use xemacs && xemacs-elisp-site-regen
diff --git a/app-admin/puppet/puppet-4.10.4.ebuild b/app-admin/puppet/puppet-4.10.4.ebuild
index 7ec0d6d305d6..9709758f9047 100644
--- a/app-admin/puppet/puppet-4.10.4.ebuild
+++ b/app-admin/puppet/puppet-4.10.4.ebuild
@@ -170,16 +170,19 @@ pkg_postinst() {
 	elog "http://forge.puppetlabs.com/gentoo/portage"
 	elog
 
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-		elog
-		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-		elog "/etc/puppetlabs/puppet"
-		elog "Also, puppet now uses config directories for modules and manifests."
-		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-		elog "for more information."
-		elog
-	fi
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
 
 	use xemacs && xemacs-elisp-site-regen
 }
diff --git a/app-admin/puppet/puppet-4.8.1.ebuild b/app-admin/puppet/puppet-4.8.1.ebuild
index 402399c195c4..37be9f4b017f 100644
--- a/app-admin/puppet/puppet-4.8.1.ebuild
+++ b/app-admin/puppet/puppet-4.8.1.ebuild
@@ -153,16 +153,19 @@ pkg_postinst() {
 	elog "http://forge.puppetlabs.com/gentoo/portage"
 	elog
 
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-		elog
-		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-		elog "/etc/puppetlabs/puppet"
-		elog "Also, puppet now uses config directories for modules and manifests."
-		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-		elog "for more information."
-		elog
-	fi
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
 
 	use emacs && elisp-site-regen
 	use xemacs && xemacs-elisp-site-regen
diff --git a/app-admin/puppet/puppet-4.9.1-r2.ebuild b/app-admin/puppet/puppet-4.9.1-r2.ebuild
index a2182bbccb5b..4cdd7b6f5c3c 100644
--- a/app-admin/puppet/puppet-4.9.1-r2.ebuild
+++ b/app-admin/puppet/puppet-4.9.1-r2.ebuild
@@ -160,16 +160,19 @@ pkg_postinst() {
 	elog "http://forge.puppetlabs.com/gentoo/portage"
 	elog
 
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-		elog
-		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-		elog "/etc/puppetlabs/puppet"
-		elog "Also, puppet now uses config directories for modules and manifests."
-		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-		elog "for more information."
-		elog
-	fi
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
 
 	use emacs && elisp-site-regen
 	use xemacs && xemacs-elisp-site-regen
diff --git a/app-admin/puppet/puppet-5.0.0.ebuild b/app-admin/puppet/puppet-5.0.0.ebuild
index 5d316d4ad940..20a7d9bce622 100644
--- a/app-admin/puppet/puppet-5.0.0.ebuild
+++ b/app-admin/puppet/puppet-5.0.0.ebuild
@@ -133,14 +133,12 @@ pkg_postinst() {
 	elog "http://forge.puppetlabs.com/gentoo/portage"
 	elog
 
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
-		elog
-		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-		elog "/etc/puppetlabs/puppet"
-		elog "Also, puppet now uses config directories for modules and manifests."
-		elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-		elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-		elog "for more information."
-		elog
-	fi
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
 }
diff --git a/app-cdr/burncdda/Manifest b/app-cdr/burncdda/Manifest
index 9e7d02c138ab..709b67f6dcca 100644
--- a/app-cdr/burncdda/Manifest
+++ b/app-cdr/burncdda/Manifest
@@ -1 +1,2 @@
 DIST burncdda-1.8.0.tar.gz 23795 SHA256 cd0caf43040e70ccd15df7377feeed667487e2dfa125858843898fcb462b6299 SHA512 798d2f6c51005dc87d1214e82cc5b2227bdf34b93b0457382cb0eb86a1426be9e61df5029460b42842cb730b806934447f6adb9ed7e6674e69d4910799b3ee92 WHIRLPOOL c07dd54c367b9ef27b738dbe655390eef74b0af835281b5c89c1cd41a8a7fb9d3a766f63a18e255930fc2a25237706852f462b301a662e108a05eeb10ee49f43
+DIST burncdda-1.8.3.tar.gz 23710 SHA256 2393f57cd40f3a67cc4bc6501d45986b05d2b9576ea4150d794cecee4441aa5a SHA512 b0ddf9457ca9a1b8ad07b43aba4b5c6532ef09aae85b363802084bcf7bbb4d4bfadf980af98862dfbdd72e257d287f1e517323ebec7432be3514880e393e9f1d WHIRLPOOL 6d67f5c8cad7a6cc7bf882e622b2706ec66028daa869f3dd2009c8f6a033bfe82303cc9a071b513ece92863e29724e140b3901ef271964b544a8b0abdffa5c90
diff --git a/app-cdr/burncdda/burncdda-1.8.3.ebuild b/app-cdr/burncdda/burncdda-1.8.3.ebuild
new file mode 100644
index 000000000000..bd4c681f99c9
--- /dev/null
+++ b/app-cdr/burncdda/burncdda-1.8.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Console app for copying burning audio cds"
+HOMEPAGE="http://www.thenktor.homepage.t-online.de/burncdda"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="flac mp3 vorbis"
+
+RDEPEND="
+	app-cdr/cdrdao
+	dev-util/dialog
+	media-sound/normalize
+	media-sound/sox
+	virtual/cdrtools
+	flac? ( media-libs/flac )
+	mp3? (
+		media-sound/mpg123
+		media-sound/mp3_check
+	)
+	vorbis? ( media-sound/vorbis-tools )
+"
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins *.func
+
+	insinto /etc
+	doins ${PN}.conf
+
+	dodoc ChangeLog
+	doman burncdda.1
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 19d600af893d..3bdf310ce7a5 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -4,3 +4,4 @@ DIST keybase-1.0.16.tar.gz 41810206 SHA256 e8a7ecb56153c1068432ee7d13b8619870662
 DIST keybase-1.0.17.tar.gz 33200376 SHA256 937b4bc61c889ef3982a5352d8a49cda8a4f4db28732d4cb21df1fe20128399c SHA512 56334779ab7c11a947557af7d22c662d862804104fff7c853776b0bb28116ae4b789abecd6b75d07a440fae0fc3af4438b85fbd271eb1310c8bf77ce1017e145 WHIRLPOOL f2d44ac207796b1d514e8bb87aced0ba0cd82f64fde87b910f603926364f70d7fdea79b23e1dc2c29efc0278f5c2eb80a53b3efac2d157008eb327a38622566c
 DIST keybase-1.0.18.tar.gz 19860878 SHA256 8a4ebcb3ce8e3ed3649be870ab407fafeaeaed23c399f18dc25cba50fbb7f5a6 SHA512 3b8938839421da0fca2958c576e5987abeaf178c01ad979fe0b88d55bc5e93180951747dbe59bec26597c1ce41075e80a76af5a3666e7c248b640ad6b1052ddc WHIRLPOOL c48d3417833a6f9bd835d85cd4116923bb35268182983181297e4811c4f76bf730713dfeb3d61dd89ae280b2e318e8fb34ae54f5dc515a96350f0cda12c9388c
 DIST keybase-1.0.20.tar.gz 21506558 SHA256 792545bd527ccc815f2edf8efebddefcd55417c25f6ef16b85e95e9d79227023 SHA512 dcb727b701d0178c94232e3746fd0de6f13121c10d8c6be714f082d382881d727e0b751e0deea184a4ee2bedcfe56b7ba72e60cab5671f2388d5d9f7f53ca05f WHIRLPOOL a91f657ffe4ed98fd4d76c77bd5cfc5263d5d2b1d228ed485ba02eabd5a395811a35152ac718919f2c82f7b128ace708adfcf6d2388bb5427ce49d4dc3c54e46
+DIST keybase-1.0.21.tar.gz 21127410 SHA256 a9bbaf16cb7b7cc3614ca5e76e0fb1b3bd164f38e14b9d49d4ca351941c8c0a3 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5 WHIRLPOOL 796d5e89f87575cfc621c714c304b0a502773511f5d43d178c0f4484e3386df6975f665b723ceb0f834fc5d4be0c5c288324a15e5d0d9b2633fb984e3f8cf183
diff --git a/app-crypt/keybase/keybase-1.0.21.ebuild b/app-crypt/keybase/keybase-1.0.21.ebuild
new file mode 100644
index 000000000000..92df05b55e79
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.21.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/keybase/keybase-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild
new file mode 100644
index 000000000000..09718d4794cd
--- /dev/null
+++ b/app-crypt/keybase/keybase-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator git-r3
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+EGIT_REPO_URI="https://github.com/keybase/client.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	git-r3_src_unpack
+	mkdir -p "$(dirname "${S}")" || die
+	ln -s "${WORKDIR}/${PN}-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index ba027ffa745c..9d69cb442974 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -1,2 +1,3 @@
 DIST pgpdump-0.30.tar.gz 63152 SHA256 8c36a005baee8dd6e730e5735c7ac2bbc8826a1bb29f500c0202d00fd62baad4 SHA512 e250dc82bb890a7645a41f6ddbfad9155ddf70f2ea53b09e771e9b6851d05d3fba88e16b106681ab092174e79ad709ed860be25bfded1ca7f369b357e8c72730 WHIRLPOOL 80a054e53d262ad5d349ecb10a5f421c1308de248ad9e2884eb4f37244f79efb3428dedd6d1d2d6b59cdb20b76c95f8ac6674fab3b47635944e0012c8eeaa59c
 DIST pgpdump-0.31.tar.gz 63808 SHA256 206ae52d4a8bbfa095b6ceefcc8b53ccabcdb75696db3bae5e05c15433729813 SHA512 10d138baf0e3c9a47f6c8549a94b14eaa8babf95a09265e3a5b91469598726d6ee94cc7c481688c2d2b63917d6daba1bb368923aaf75adac6b18694d9a2940c4 WHIRLPOOL b706d92da109305b72900e7f31aec70b2a9a286e49ab13a03801623ac8997df5c8dc1f30d829aef35dd8d898786748b37dcdeb8cc178f3cddac0662f014a6b03
+DIST pgpdump-0.32.tar.gz 65444 SHA256 2d49d9fa5c12750abc16e09db7f52950b526475bdb27ad16e489c92b59c2af25 SHA512 3f28a301cce703e934eb8b6124af4db78801d444ce74f43f8511009ea0684f9e9c229ef2a18cc732fe0854f2e02c4bbfdee46ffee64a5f490ff06c060472e49d WHIRLPOOL 2df4bbd29a9cd5dda1718fb498db2bd7b8a24d54d979f519f2323578f1a0177caa871c26e79ae27fc8d9597862456d594eb1084c49ccef13e9c9f621a682295a
diff --git a/app-crypt/pgpdump/files/pgpdump-0.32-respect-ldflags.patch b/app-crypt/pgpdump/files/pgpdump-0.32-respect-ldflags.patch
new file mode 100644
index 000000000000..44f81b451489
--- /dev/null
+++ b/app-crypt/pgpdump/files/pgpdump-0.32-respect-ldflags.patch
@@ -0,0 +1,42 @@
+From 43dfe847efa8e614b3e6f8d37ad04ba577ead595 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@rueg.eu>
+Date: Fri, 16 Jun 2017 10:11:36 +0200
+Subject: [PATCH] Respect LDFLAGS, minor other improvements
+
+---
+ Makefile.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f9bff30..969a16f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,8 @@ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ mandir = @mandir@
+ LIBS = @LIBS@
+-CFLAGS  = @CFLAGS@ -O -Wall
++CC = @CC@
++CFLAGS  = @CFLAGS@ -Wall
+ LDFLAGS = @LDFLAGS@
+ VERSION = `git tag | tail -1 | sed -e 's/v//'`
+ 
+@@ -22,13 +23,13 @@ MAN  = pgpdump.1
+ CNF = config.h config.status config.cache config.log
+ MKF = Makefile
+ 
+-.c.o:
++%.o : %.c
+ 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+ 
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LIBS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	$(RM) $(OBJS) $(PROG)
+-- 
+2.13.1
+
diff --git a/app-crypt/pgpdump/pgpdump-0.32.ebuild b/app-crypt/pgpdump/pgpdump-0.32.ebuild
new file mode 100644
index 000000000000..13720556f1ed
--- /dev/null
+++ b/app-crypt/pgpdump/pgpdump-0.32.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A PGP packet visualizer"
+HOMEPAGE="http://www.mew.org/~kazu/proj/pgpdump/"
+SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
+)
+
+src_install() {
+	dobin pgpdump
+	doman pgpdump.1
+	dodoc CHANGES README.md
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index f4f03079460b..624a93ce9c2c 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -4,3 +4,4 @@ DIST diskimage-builder-2.4.0.tar.gz 308467 SHA256 ae9bc8b0dde17d422785d009915299
 DIST diskimage-builder-2.4.1.tar.gz 304969 SHA256 9a01eabc73bde93da3fde598249cc273c6cc744e8e6b850a0f7dd7e69c076543 SHA512 32ef8b7cae08c90691256be4b8b65c986de00306d935919c7d9ecba21722534da8bb00ab887b810bfff35e60c1e943641de576a7c4b29a6ff3d15315b55fb307 WHIRLPOOL a4e9a30452e2e0785e371968d463a95a04d5e9a7316decc2a00e27038b3606ca03515535b76e721eb12b8072567c91f9a6372d780fb60ab983d81071f88974e4
 DIST diskimage-builder-2.5.0.tar.gz 312486 SHA256 5c665dbd6b8e3f24be26e65159a560b34e2250111adb4c7569db453d4bbbdf6c SHA512 b254b5ca9d56ace54fcdd90ec35065bb67312a203529b94d24ff6629a159e6918bae291b2bc2f8218b38caa8fe65369ebaf8c286994b060c4f62342e6a192bea WHIRLPOOL 31f3f4867dcd7543c7e6006717dc13de0d0d00f23a96126ce1cfac20bd24b17803422099a5737dd7b4aea1ddf53c9b9b6d3ad702fb0ace72bcb4ddb03d33acd1
 DIST diskimage-builder-2.6.1.tar.gz 312190 SHA256 4f5a9405c3b6599afe2ed037ef3dc72727a539a8b902dd23f1905dd772ab2ad1 SHA512 d79ec6b0cc7962b8dbd4a3f8d5193907f89c39e15a73fd5cd9cf5203792df2de7ced6b0acbe53e9d1cb7e100751f36c1bc77db2be1f25ab9472ca759f54bdc4b WHIRLPOOL 234308ec76126f8b1002e47a72eec3590b39997acfd6e9ea8c0ebdddfee01ab6a9dd249a5e245d58475f067ef0635d783ee9cc82344c9061d69dce38fa4ae888
+DIST diskimage-builder-2.7.0.tar.gz 316192 SHA256 3ed8b45f48a7112d1f94eda41bdff896ed4d7b2e95eea69d486f4063981f4453 SHA512 05835300b3de7a29b17816bf009d78d596648ef99a1ff57965d07081f4a6bef6e8f99ffb0a4af153f2de40c2142da1ff9879eeea1ab67427e404199ea6f0e263 WHIRLPOOL 60b84496d42a3e5754da069a048637703233e3c050350ce68e86ef4eb473be46199e90425efb5e78d7b3182144d22e348fb1f0b3a0e90f5b0533ef4301f05411
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.7.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.7.0.ebuild
new file mode 100644
index 000000000000..f8a2aaffcd34
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-registry/Manifest b/app-emulation/docker-registry/Manifest
index 653e661f8fcb..5f005fdec415 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -1,3 +1 @@
-DIST docker-registry-2.5.1.tar.gz 1604279 SHA256 d98ebca3518c17d95468b1d40b87861036001301a16a50563203e4b9af72c514 SHA512 5217e2ca361d71806c8ec4da1cf1c2c5dc4160b84c2a98feae50872342d0acf116768a3acf00769bafd66e73c9922c7fe97cbde51955d8aa1d1ed914de2e3d34 WHIRLPOOL 12db4c397f6309a57252cfe19a055f610567c526a05220c9b6ac0d7ff21863520cc126f95b34c8e48fb7ae6ba6a298d0e6b53bf4866cf13bf95fcfb591c538b7
-DIST docker-registry-2.6.0.tar.gz 1578641 SHA256 5e03dbeaf87936b06d3c6f61fb12d9f759b2ca89225eb71b288488a2fd10571c SHA512 589ef6968d4f71a8e0c201c02007fb6cf80a9206e0ba699be6cc6cc29a5bfeb759bc8928a21fb73a3710d747eb99136c228b630889af8870cdfa508e20ff5f4e WHIRLPOOL 71c4c78ee587f5346127eed4cb00d3bb55c565e5d376c0a4c7f7b3ec7c7fbc10377e190bf98833a6ac6e8e43f3a100526554b5f5e24238a1de047fc458edf74d
-DIST docker-registry-2.6.1.tar.gz 1577794 SHA256 21d1b5fd4001c45d125d6345c387f1840f984c069b5556d0c8ad1850d6e25b9f SHA512 a2175cb5ab049599e1bdae7026dc84e14b79883eca3ceaafda54497a1743103f125f65fa3922c003363dd86aa1422f539aff8b17746b9768968fef757e931c36 WHIRLPOOL 3e1c5684462d6e31d3f28d67f4ab2dacf8037b793c11ecca49846ca4124a0ce54b9481471cb77190dc3b63de882571b88beba1bb5d7d04b8cbb92b8a597b0fed
+DIST docker-registry-2.6.2.tar.gz 1579760 SHA256 963e4e98a99f484c903b888e2661a10794e79906ccf9a6a9b17172f9c1705f0d SHA512 a091db2e15d7c1dc8cd39a40de5bb63cc1ead68e95dfaf6b3735a789adb87f146c03eff81f700e0059e5f6ffc43e6c3dd3358503697882cb080b991629f82c60 WHIRLPOOL 55f9e7cc5a643be1d791e6d19610db9a8a4c59f7c73ae105cce11917b12691418fa2d310103788d06d74c6bfc809d20de9f5e1a1ab4b3861062db93c8861158f
diff --git a/app-emulation/docker-registry/docker-registry-2.5.1.ebuild b/app-emulation/docker-registry/docker-registry-2.5.1.ebuild
deleted file mode 100644
index c0630843dc6b..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution/..."
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://${EGO_PN%/*}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.5"
-SVCNAME=registry
-
-pkg_setup() {
-	enewgroup ${SVCNAME}
-	enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_compile() {
-	GOPATH="${S}" GO15VENDOREXPERIMENT=1 \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe "${S}"/bin/*
-	insinto /etc/docker/registry
-	newins "${S}"/src/${EGO_PN%/*}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/{lib,log}/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/docker-registry/docker-registry-2.6.0.ebuild b/app-emulation/docker-registry/docker-registry-2.6.0.ebuild
deleted file mode 100644
index bade450252a4..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution/..."
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://${EGO_PN%/*}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/go-1.5"
-SVCNAME=registry
-
-pkg_setup() {
-	enewgroup ${SVCNAME}
-	enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_compile() {
-	GOPATH="${S}" GO15VENDOREXPERIMENT=1 \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe "${S}"/bin/*
-	insinto /etc/docker/registry
-	newins "${S}"/src/${EGO_PN%/*}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/{lib,log}/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/docker-registry/docker-registry-2.6.1.ebuild b/app-emulation/docker-registry/docker-registry-2.6.1.ebuild
deleted file mode 100644
index ff9eab00e72d..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.6.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution/..."
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-SVCNAME=registry
-
-pkg_setup() {
-	enewgroup ${SVCNAME}
-	enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_compile() {
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN%/*}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/{lib,log}/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/docker-registry/docker-registry-2.6.1-r1.ebuild b/app-emulation/docker-registry/docker-registry-2.6.2.ebuild
similarity index 73%
rename from app-emulation/docker-registry/docker-registry-2.6.1-r1.ebuild
rename to app-emulation/docker-registry/docker-registry-2.6.2.ebuild
index 45aac739ef06..6ea2a86bd59b 100644
--- a/app-emulation/docker-registry/docker-registry-2.6.1-r1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.6.2.ebuild
@@ -5,9 +5,9 @@ EAPI=6
 inherit golang-vcs-snapshot systemd user
 
 KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution/..."
+EGO_PN="github.com/docker/distribution"
 EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="Docker Registry 2.0"
 HOMEPAGE="https://github.com/docker/distribution"
 LICENSE="Apache-2.0"
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 SVCNAME=registry
 
-PATCHES=( "${FILESDIR}/${P}-notifications-expvar.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.6.1-notifications-expvar.patch" )
 
 pkg_setup() {
 	enewgroup ${SVCNAME}
@@ -24,14 +24,14 @@ pkg_setup() {
 
 src_compile() {
 	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
 }
 
 src_install() {
 	exeinto /usr/libexec/${PN}
 	doexe bin/*
 	insinto /etc/docker/registry
-	newins src/${EGO_PN%/*}/cmd/registry/config-example.yml config.yml.example
+	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
 	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
 	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
 	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index bbdc6cd59f5b..f32b238dee1c 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1 +1,2 @@
 DIST virt-what-1.12.tar.gz 147144 SHA256 2592082f5b2caa93d3967b7c275a3afabfe49de9f051fdf0da6ded59e2c11b1c SHA512 629e452419a01b86cd5442c4294b5aea6fc475522d7a350ac8e727b59e63948915c755fe6cae16f7824749059662bb0fbd4557a2aa56c098b407037a35881735 WHIRLPOOL a3f9a519c183950a766fe407f8e814a131e2586d738fa0fdbf341d0755bbf726e58da9cde594a8b7c32b9c27094c442ff95b6d3e5adaf92b57d96710383453d3
+DIST virt-what-1.15.tar.gz 163117 SHA256 7ab9220d4682eadf9139c6afe62d33ebd273fff69e49054279caba5514937c41 SHA512 b85d02eb632328031be93dd33be1e42603e55182c4458fca9b9d98465ff7487fc399d01ebd117a8311960091c1b166547380b9a54c0054ebf2c0aa454d9a41e5 WHIRLPOOL 6d5d439f5617ef80f4cdda752717cce7025669e518f6fb327a5e7595935153ba58ea8271e4ed84c203d3888b877f60ae136f54aca97bd4f79a1cc18bf2365480
diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml
index 5d38a8b1ce9d..7e3c0f29d1a5 100644
--- a/app-emulation/virt-what/metadata.xml
+++ b/app-emulation/virt-what/metadata.xml
@@ -5,6 +5,10 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>eva@gentoo.org</email>
+		<name>Gilles Dartiguelongue</name>
+	</maintainer>
 	<use>
 		<flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to read firmware data</flag>
 	</use>
diff --git a/app-emulation/virt-what/virt-what-1.15.ebuild b/app-emulation/virt-what/virt-what-1.15.ebuild
new file mode 100644
index 000000000000..cdae6323c82b
--- /dev/null
+++ b/app-emulation/virt-what/virt-what-1.15.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Detects if the current machine is running in a virtual machine"
+HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
+SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dmi"
+
+DEPEND="dev-lang/perl"
+RDEPEND="app-shells/bash
+		dmi? ( sys-apps/dmidecode )"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index a11e2dc90a87..050f170c6920 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,9 +1,11 @@
 DIST wine-2.0.1.tar.xz 18845444 SHA256 6cfb4eaae566dc7afb7ac0f1f2db2c0d69969952acab0debf084ee8f7b071583 SHA512 b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d WHIRLPOOL 0fbaf53504e4e40db6227f45f5b92ac388c2bf23d4f573e4d3b60ccaaadeeccb5a696226d1bd4aa8b245f21c8d6a13aac423ead3f4692ebc1e8e613714168501
+DIST wine-2.0.2.tar.xz 18854952 SHA256 f71884f539928877f4b415309f582825d3d3c9976104e43d566944c710713c9a SHA512 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90 WHIRLPOOL cf21a899c60749c37353abc4ba974b3d6cc369769ace70fde899ff1cb5ac8a97828165cf2dbfbcf0915f5196ac58974948fe3e5b2c9854296a5eea75f8023ae5
 DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 WHIRLPOOL fa9f774d87dae73c7d1f3b86dc3b03ea27065eb6140f1cac13c82fe16f7ebff8f8365ed447220cf5c2788b9f4aae7c482e4f9e2e69f47e5435209e148f5dbdfe
 DIST wine-2.1.tar.xz 18887032 SHA256 bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 WHIRLPOOL 063d935f1ff0922100641f2f53cdac23d2993a83182d45e028e485fd7d0a13bc5cfb77bca76550b1537b3f42fecacef7fd64785adbf6425af823f56f96973b54
 DIST wine-2.10.tar.xz 19209580 SHA256 488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179 SHA512 8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139 WHIRLPOOL e9a8248aac31593fbac28a3d8d4e62bfce14a7c41cc416ebfca8606518d28efd31b32196133da211f75f48bd228bd5d21fcbbc0479293e813ed99b258b37126e
 DIST wine-2.11.tar.xz 19251116 SHA256 efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c SHA512 691f329c47af5e51498287029988b8ca0777bfc3902ed80fd315004aba2337a938e79177e752efe86423c9b34544df3952b8c443bf43149356575fac75a779ac WHIRLPOOL 4933e1ce640b0abeebccd6969b5eaf4eec76cd135d9cfc1d904a902219f776a68f72e2bd1ae9019d69f0d0d81fd8ead0084785d1b9710590349365977f9c1817
 DIST wine-2.12.tar.xz 19301968 SHA256 496c11af841487e6ec4e1953ac19b05a7f48e397da502653ffbd9fe9004213a7 SHA512 d44c1937d7d2d797150381f70317b810616d61355a59be096366d3507f59b678cffaf6d841cecf02bf9d2afa3dbf4d19270f80fb1d3ba5f0f93787d40c328f62 WHIRLPOOL 6f4b9baa6fcfe86f3d195fe603c2b9450a72a593c8f7042959b42a76880cb4ae680fde7beb70a8e823150849fda36c42985035de891ebf0088c8ffc2bceb15bf
+DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe4a9c148a17a44703587ef8 SHA512 71873b9ec1605dd5f7502b87b0f3429c3d14a4196543d7304df455854b58ef82b8fafdcea91450cbfc01434a44886a0e0c4c4cf289ffb53167dde0f969cddc48 WHIRLPOOL 6faf1e6aeea2ab7ccc496ed85834f98eb25111c8f541c24d4876a142ad4acf7d9a4c08c2716e11fb6c92fe7aad29980cab912eb9dbb6759bdbdeca2f2f8e78a7
 DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
 DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild
new file mode 100644
index 000000000000..6dca9cc6a737
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2.ebuild
@@ -0,0 +1,507 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.6.4 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+		"${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+	)
+
+	default
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.13.ebuild
new file mode 100644
index 000000000000..4f9ef6e66fda
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.13.ebuild
@@ -0,0 +1,509 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+		"${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+	)
+
+	default
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index e9b38ff15c1e..5a74d90d5669 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (
diff --git a/app-misc/plod/plod-1.9-r2.ebuild b/app-misc/plod/plod-1.9-r2.ebuild
new file mode 100644
index 000000000000..3bb385546efd
--- /dev/null
+++ b/app-misc/plod/plod-1.9-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool to help administrators keep track of daily activities"
+HOMEPAGE="http://www.deer-run.com/~hal/"
+SRC_URI="http://www.far2wise.net/plod/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+	default
+
+	# Bug 619934. Change directories first to ensure that "unpack" outputs
+	# to ${S} and not to ${WORKDIR}.
+	cd "${S}" || die
+	unpack "${S}/${PN}.1.gz"
+}
+
+src_prepare() {
+	default
+	sed -i -e 's#/usr/local#/usr#' "${PN}" || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+
+	insinto /etc
+	doins "${FILESDIR}/${PN}rc"
+
+	dodoc README TODO
+}
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index d2b632d582e6..7f54dbfaf363 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
 HOMEPAGE="http://www.tcsh.org/"
 SRC_URI="
 	ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
-	https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
+	https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
index 33499f1f44b0..650a1b36d5b1 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-vim/nagios-syntax/Manifest b/app-vim/nagios-syntax/Manifest
index 159f8be3c70a..02b19638f21e 100644
--- a/app-vim/nagios-syntax/Manifest
+++ b/app-vim/nagios-syntax/Manifest
@@ -1 +1,2 @@
+DIST nagios-syntax-1.8.tar.gz 1737 SHA256 83976725d00e3d346456a1d53755552622f1c01b501a266064919071a8b1fb31 SHA512 53a17c521a66a42f0082e6a963059ff96ed5f899e2be4c50ab68cbf237d1ca6bec8476b798b4a99563a8fdd6dc6ef632de19399b5aad12bad586f0cf0161f76f WHIRLPOOL 99f376c40dfa0a09915a986d305be629bb259c834a38cdc25e8276d5de92dfb75e62ecf8d913994488ab14cb16cf232f21826047589cc9bb0024efcc5d414807
 DIST nagios-syntax-20050105.tar.bz2 1721 SHA256 76ddf01aefe98d124a8c120c39060c6f374e8333cdd644d075f4e445ecfc3399 SHA512 4bfca41c7aac4580511bf651db67c0dc16fcdcb09137ba27ce5472be9e3695db0ac254dca370b0f3576ab58959cd0ca5235833e45b1186c6f6721ca3d5793c6b WHIRLPOOL b5727573851e7d43a8bd84830e58c8c0cee65316a24ad5fee7d8f2d1890cb5b2f66ea40e738b7182e5800e2710260a0f32b9a22dd8b365807361f1e7cfe98148
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
new file mode 100644
index 000000000000..d8cbec98c140
--- /dev/null
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nagios configuration files syntax"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2261"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="vim.org"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Nagios configuration
+files. Detection is by filename (/etc/nagios/)."
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-2.2
new file mode 100644
index 000000000000..d217744de9c2
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/init.d-2.2
@@ -0,0 +1,191 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_stopped_commands="boostrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+
+depend() {
+	use net.lo
+	# localmount needed for $basedir
+	need localmount
+}
+
+get_config() {
+	my_print_defaults --defaults-file="$1" --mysqld |
+	sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+	local ebextra=
+	case "${SVCNAME}" in
+		mysql*) ;;
+		*) ebextra=" (mysql)" ;;
+	esac
+	echo "${SVCNAME}${ebextra}"
+}
+
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+	mark_service_starting
+	if start ; then
+		mark_service_started
+		return 0
+	else
+		mark_service_stopped
+		return 1
+	fi
+}
+
+start() {
+	# Check for old conf.d variables that mean migration was not yet done.
+	set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
+	rc=$?
+	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
+	# It does have a use in testing, as it is possible to build a config file
+	# that works with both the old and new init scripts simulateously.
+	if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
+		eerror "Not proceeding because it may be dangerous."
+		return 1
+	fi
+
+	# Check the config or die
+	if [ ${RC_CMD} != "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	# Now we can startup
+	ebegin "Starting $(mysql_svcname)"
+
+	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+
+	if [ ! -r "${MY_CNF}" ] ; then
+		eerror "Cannot read the configuration file \`${MY_CNF}'"
+		return 1
+	fi
+
+	# tail -n1 is critical as these we only want the last instance of the option
+	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
+
+	if [ -n "${chroot}" ] ; then
+		socket="${chroot}/${socket}"
+		pidfile="${chroot}/${pidfile}"
+	fi
+
+	# Galera: Only check datadir if not starting a new cluster and galera is enabled
+	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+	[ "${wsrep}" = "1" ] && wsrep="on"
+	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
+
+		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+		if [ ! -d "${datadir}" ] ; then
+			eerror "MySQL datadir \`${datadir}' is empty or invalid"
+			eerror "Please check your config file \`${MY_CNF}'"
+			return 1
+		fi
+
+		if [ ! -d "${datadir}"/mysql ] ; then
+			# find which package is installed to report an error
+			local EROOT=$(portageq envvar EROOT)
+			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+			if [ -z ${DBPKG_P} ] ; then
+				eerror "You don't appear to have a server package installed yet."
+			else
+				eerror "You don't appear to have the mysql database installed yet."
+				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+			fi
+			return 1
+		fi
+	fi
+
+	local piddir="${pidfile%/*}"
+	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		eerror "Directory $piddir for pidfile does not exist and cannot be created"
+		return 1
+	fi
+
+	local startup_timeout=${STARTUP_TIMEOUT:-900}
+	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+	start-stop-daemon \
+		${DEBUG:+"--verbose"} \
+		--start \
+		--exec "${basedir}"/sbin/mysqld \
+		--pidfile "${pidfile}" \
+		--background \
+		--wait ${startup_early_timeout} \
+		${tmpnice} \
+		${tmpionice} \
+		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
+	local ret=$?
+	if [ ${ret} -ne 0 ] ; then
+		eend ${ret}
+		return ${ret}
+	fi
+
+	ewaitfile ${startup_timeout} "${socket}"
+	eend $? || return 1
+
+	save_options pidfile "${pidfile}"
+	save_options basedir "${basedir}"
+}
+
+stop() {
+	if [ ${RC_CMD} = "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	ebegin "Stopping $(mysql_svcname)"
+
+	local pidfile="$(get_options pidfile)"
+	local basedir="$(get_options basedir)"
+	local stop_timeout=${STOP_TIMEOUT:-120}
+
+	start-stop-daemon \
+		${DEBUG:+"--verbose"} \
+		--stop \
+		--exec "${basedir}"/sbin/mysqld \
+		--pidfile "${pidfile}" \
+		--retry ${stop_timeout}
+	eend $?
+}
+
+checkconfig() {
+	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
+	local svc_name=$(mysql_svcname)
+	ebegin "Checking mysqld configuration for ${svc_name}"
+
+	if [ ${RC_CMD} = "checkconfig" ] ; then
+		# We are calling checkconfig specifically.  Print warnings regardless.
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+	else
+		# Suppress output to check the return value
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
+
+		# If the above command does not return 0,
+		# then there is an error to echo to the user
+		if [ $? -ne 0 ] ; then
+			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+		fi
+	fi
+
+	eend $? "${svc_name} config check failed"
+}
+
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
diff --git a/dev-db/mysql-init-scripts/files/init.d-s6-2.2 b/dev-db/mysql-init-scripts/files/init.d-s6-2.2
new file mode 100644
index 000000000000..427061aa9904
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/init.d-s6-2.2
@@ -0,0 +1,163 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net.lo
+	# localmount needed for $basedir
+	need localmount s6-svscan
+}
+
+get_config() {
+	my_print_defaults --defaults-file="$1" --mysqld |
+	sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+	local ebextra=
+	case "${svc_name}" in
+		mysql*) ;;
+		*) ebextra=" (mysql)" ;;
+	esac
+	echo "${svc_name}${ebextra}"
+}
+
+stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
+
+bootstrap_galera() {
+	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
+	mark_service_starting
+	if start_pre && start ; then
+		mark_service_started
+		return 0
+	else
+		mark_service_stopped
+		return 1
+	fi
+}
+
+
+extra_commands="checkconfig"
+extra_stopped_commands="boostrap_galera"
+
+description_checkconfig="Verify the server's configuration"
+description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+supervisor=s6
+name=$(mysql_svcname)
+s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"
+#s6_svwait_options_start="-U -t $((1000*${STARTUP_EARLY_TIMEOUT:-1000}))"
+svc_name=${RC_SVCNAME%-s6}
+s6_service_path=/var/svc.d/${svc_name}
+
+start_pre() {
+	# Check the config or die
+	if [ ${RC_CMD} != "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	MY_CNF="${MY_CNF:-/etc/${svc_name}/my.cnf}"
+
+	if [ ! -r "${MY_CNF}" ] ; then
+		eerror "Cannot read the configuration file \`${MY_CNF}'"
+		return 1
+	fi
+
+	# tail -n1 is critical as these we only want the last instance of the option
+	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
+	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
+
+	if [ -n "${chroot}" ] ; then
+		socket="${chroot}/${socket}"
+		pidfile="${chroot}/${pidfile}"
+	fi
+
+	# Galera: Only check datadir if not starting a new cluster and galera is enabled
+	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
+	[ "${wsrep}" = "1" ] && wsrep="on"
+	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
+
+		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+		if [ ! -d "${datadir}" ] ; then
+			eerror "MySQL datadir \`${datadir}' is empty or invalid"
+			eerror "Please check your config file \`${MY_CNF}'"
+			return 1
+		fi
+
+		if [ ! -d "${datadir}"/mysql ] ; then
+			# find which package is installed to report an error
+			local EROOT=$(portageq envvar EROOT)
+			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
+			if [ -z ${DBPKG_P} ] ; then
+				eerror "You don't appear to have a server package installed yet."
+			else
+				eerror "You don't appear to have the mysql database installed yet."
+				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+			fi
+			return 1
+		fi
+	fi
+
+	local piddir="${pidfile%/*}"
+	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		eerror "Directory $piddir for pidfile does not exist and cannot be created"
+		return 1
+	fi
+
+	# Prepare env files to source
+	mkdir -p "/var/svc.d/${svc_name}"
+	echo "MY_CNF=\"${MY_CNF}\"" > "/var/svc.d/${svc_name}/env"
+	echo "MY_ARGS=\"${MY_ARGS}\"" >> "/var/svc.d/${svc_name}/env"
+	echo "basedir=\"${basedir}\"" >> "/var/svc.d/${svc_name}/env"
+	mkdir -p "/var/svc.d/${svc_name}/log"
+	echo "SVCNAME=\"${svc_name}\"" > "/var/svc.d/${svc_name}/log/env"
+	echo "S6_LOG_OPTIONS=\"${S6_LOG_OPTIONS}\"" > "/var/svc.d/${svc_name}/log/env"
+}
+
+start_post() {
+	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
+	local startup_timeout=${STARTUP_TIMEOUT:-900}
+
+	if [ -n "${chroot}" ] ; then
+		socket="${chroot}/${socket}"
+	fi
+	ewaitfile ${startup_timeout} "${socket}"
+}
+
+checkconfig() {
+	local my_cnf="${MY_CNF:-/etc/${svc_name}/my.cnf}"
+	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
+	local svc_name=$(mysql_svcname)
+	ebegin "Checking mysqld configuration for ${svc_name}"
+
+	if [ ${RC_CMD} = "checkconfig" ] ; then
+		# We are calling checkconfig specifically.  Print warnings regardless.
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+	else
+		# Suppress output to check the return value
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
+
+		# If the above command does not return 0,
+		# then there is an error to echo to the user
+		if [ $? -ne 0 ] ; then
+			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+		fi
+	fi
+
+	eend $? "${svc_name} config check failed"
+}
+
+stop_pre() {
+	if [ ${RC_CMD} = "restart" ] ; then
+		checkconfig || return 1
+	fi
+}
+
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild
new file mode 100644
index 000000000000..13ebfb9e3791
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+# The s6 support was added after openrc 0.16.2
+RDEPEND="
+	!<dev-db/mysql-5.1
+	!<sys-apps/openrc-0.16.2
+	"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+src_install() {
+	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
+
+	# s6 init scripts
+	if use amd64 || use x86 ; then
+		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
+		newinitd "${FILESDIR}/init.d-s6-2.2" "mysql-s6"
+		s6_install_service mysql "${FILESDIR}/run-s6"
+		s6_install_service mysql/log "${FILESDIR}/log-s6"
+	fi
+
+	newinitd "${FILESDIR}/init.d-2.2" "mysql"
+
+	# systemd unit installation
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/mysqld-wait-ready
+	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
+	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
+	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql" "mysql"
+}
+
+pkg_postinst() {
+	if use amd64 || use x86 ; then
+		einfo ""
+		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
+		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
+	fi
+
+	einfo ""
+	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
+	elog "You should prefer that unit over this package's mysqld.service."
+	einfo ""
+}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index c4bf5d35a5b0..6cafcce6aed7 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -2,15 +2,27 @@ DIST icedtea-bin-core-3.4.0-amd64.tar.xz 61846296 SHA256 254e4e889061e8632cbb61b
 DIST icedtea-bin-core-3.4.0-arm.tar.xz 53464220 SHA256 c5a793a6b967943bf51d334db15ea8608358d308dd9c5c8ba7ea4609d6d5ef85 SHA512 5bb1986caeedbdcae26637a4bea1177fc5cf89fa026245093083d9ff6d1a378878286ef7f6e5bd9527ce6fca3a6a5e9e152f87f68ce56afa66a86f65f4d6817a WHIRLPOOL 7a08039cd6934c73db4c72fa787566880d8ed66c47bf28a76bd4913695c2526c05464cb8a15522816abbf3d3fb5f9e76373e7ae51019cd21f1005ccd53a4624f
 DIST icedtea-bin-core-3.4.0-ppc64.tar.xz 54156476 SHA256 4ab0d286746e583be1d630e1e125a1abb9c77b0933f4e3d5002bcfef8e421b17 SHA512 705cd2479622db75af6732afd79fc20cb1f20d2b402372b0e40225dfc20d9d96fa5ae85654b6dc77cbf79257064f48e39bd02d35fe1d70881d96d1c64cf3730f WHIRLPOOL 0cf0e7097d4a33d448906109fe8b27cd9bbbdf715d690cae4704a339c82831ca65ab6b8ca4efb99ee4c99c24cd78384aae953b7f2e1cc14e4652c5aebf1c44fe
 DIST icedtea-bin-core-3.4.0-x86.tar.xz 61316304 SHA256 673dd4eb192b769c3781d3f286fb7cfcd71ca61a376070d511239f6903ff2e65 SHA512 52091c3e5eb7b453169d87aeeda348c122d5c7c03ec801fde11cb6cdb6f97ae5daa4889bfb724a50feba63ab073ca5a2c341c67a812ccb2bcd0f3866c11e74a2 WHIRLPOOL 6ee9e1239eb5981bb66056256e4c3d1e49b1dd91a9eb988bbc3146cf2317c07aed15d8e1bb8929cadbb4b235cbee7f7bbe9bf45e2eb3283cff7f5598cf2f058b
+DIST icedtea-bin-core-3.5.0-amd64.tar.xz 61880772 SHA256 c4d5534e09f92dad1cfbf8ece4d5af59dcc9bc09a36a44cb8583170de7e68c4b SHA512 97615ee562e15ac2b6e8ffc9e2d8d72e86519b0d9445f7aef9761fcef6211b9e2ddb2a595a713c21f2473946d48f349a7d0ebfa405a6acc377dfb4c2cc7fd87f WHIRLPOOL 5bcd06db08b0495db435ce0b1e181a277258209b9c67b2a584698a50b841ab0655cd24052e4120fbb9dbb232ccd414e50d98a21ef4bef443248b85851dbf1bfd
+DIST icedtea-bin-core-3.5.0-arm.tar.xz 57929932 SHA256 e5daecf51259853846442f64eb09ce7521ffed75dad133bae0aa48d0e3a087b7 SHA512 10e83c0b021232571a2768c2bd7b06f103963c8aa164e3d66f581f78590a008e50ba8e2d271842de61ffc0d41703fed9c8a4022c2dee808b9fea2d322765bb94 WHIRLPOOL d6b54a3604d25189787b62f52375aa667ff50468b30be34086fb2c67c92e1caf05536aa77d9ccc5fb318f1088fcc80365d63fb7167cc102f434e559b29f627a7
+DIST icedtea-bin-core-3.5.0-ppc64.tar.xz 54192080 SHA256 44b8cd9087c8ca0f265d119956ed4538a7d98fc3aa0c3316a47c8dd51b0c0b53 SHA512 7222fcaf67df434cf914bb0ac6f835eef38e1d61e68febd0c42159da8edd03361eeae548beb54d78fcad8b6cb1d915805aa887b0785df1a011c4671b5b5382f2 WHIRLPOOL 0b824ecf1095e94eedcff4bfed06543252f8fad8f6ece5b98d0cbb7d3fab33e54ce8b87048934b2690e791fc4aa030b27abc97d37ded71c4cf2ac78be966330c
+DIST icedtea-bin-core-3.5.0-ppc64le.tar.xz 54243552 SHA256 e8815e01db8c59966e0ea8ff06695a6b027f829527759c4085c431bbde0de5f2 SHA512 58727f07b48d1690c214b5309c3081d21f3f7719a41d1605457318e5a634cb762ff50426ab185f0149d5196f51d2cf3d4098ec874ea8f89f0b2b7716d9132dc3 WHIRLPOOL 43f5c6e19c337d3a8ff056b6d3daecd3cd60f09345c06bd96be77ad5d77811954e8397dc65bd6d51cfa812cb6caa8dc18ce412205e4a8008aba84dad3cfaa067
+DIST icedtea-bin-core-3.5.0-x86.tar.xz 61349140 SHA256 db3f200c5611d33a8f1f0f28a36a0f4231f8c1ff91e178c6abd820cacca1789a SHA512 20eb965e029b0a3cf03122b176ceed22c1ef361b1105dc8e4ef4e9a8f885781148a367d01efe8789c9d93ad0da77cb7f490f806bf779304b4dc42741572ee72a WHIRLPOOL f3977fc2edcb9d1b942b2c48ebb7d5ba079ad42610003fd3b0eb2c54f52a1063aaea334c59522402cb400dc81c33c72120267248f00d7fc564774b82bcaf148d
 DIST icedtea-bin-core-7.2.6.10-amd64.tar.xz 53414248 SHA256 332468fbfacd89cffd6f6f7f4860bbf9a4e49446e09d4a38154cef1f018a154d SHA512 11e2d094c3f53ffce8ddd639501d0ded25b991ede87521208da66cfe60c9d43ba1d5a0bb8b7985db5555796c1beaf931cc385a4c78910c1ddfc790322a678bc2 WHIRLPOOL e6a9a4b3043c53fb07d2b39bff08e13393a5cf515f901334397a3a6409efb79b98ac752830a6d73a7fa767e46589fc28d137c8422488b7b68b0da7a180e7e507
 DIST icedtea-bin-core-7.2.6.10-x86.tar.xz 55334952 SHA256 717ebb14e834390206578c9ed487a03f3e80e663eb7c08d39dd05785641a1332 SHA512 4e0a8eb204d1144d9f784f0bc4de3f7ff6d84585c34c154f9f49b3bed2c2896ccbaadb016bd252c7f4d8402d4857f3541da1a953325d0bd962ff0674587c6d76 WHIRLPOOL 6d4f161aa8a403fd2517b390a4465c3513e470ed5ff9f8b5fdbfc659411668951dc336b972740d558f39b91234ab4e7cc764faa0ca59ee9a747685eed93422c3
 DIST icedtea-bin-doc-3.4.0.tar.xz 11684272 SHA256 fb6d16f81bfc1b6d8c9bbf93a07797a3b667c7e3fbf6083292cfb858b6f58056 SHA512 06682cdb16fa7a49918f892aeb9ab6bf3fb4a4fc2b64cc555b38d38f826a70fa2451a5c549d0f1c113fc20f216d9ae3ab2fd81cd88ea79a14af94854e9ef3799 WHIRLPOOL 666aec67b8f1fe8d4bc2bdb0a5873ece59cebb44c480074d694365a04c40c17bc54913394fcbf6ce6257bac35e9e831217ec0806e63d9f7a66a97a480e6d4dbd
+DIST icedtea-bin-doc-3.5.0.tar.xz 11680592 SHA256 b6e06d86ec3ceb1937658196970a9f187162d36f385dbea5692dd641d1d03da5 SHA512 65d4ab3bd98f1071324b266746f32fee91c715474878ede271bf12cf392e8c87b8476c78cde47b20faccee94b980d7586100afea844d99895370569998c0c96e WHIRLPOOL 2859a06117447ee6703fcc7702b5286e46bb6facb57a55cee13c69bc84fd128b4f47a6c5169fc8f00fadbf3c4a747156ad92b3417b2e19d07e852d0605de6962
 DIST icedtea-bin-doc-7.2.6.10.tar.xz 10614336 SHA256 e8a79fd42c8b6341df6dfc9a5a277aaecadcfe48e214988c900d1773313a95e2 SHA512 fa0748d0042f297527f5af11beccdad0b671225b8f258495ec93faa3f55b8669488575e53375ec71a8a8c75d17db4b26fd5980ce0381ed5ab598fb5c07c80af6 WHIRLPOOL 3f9f82c115869c5f849527485ef841d6b985139c3494e388a4d0a4a5c9adeba6c45aabe2da87d9717c692866a8baad0170f1059dd22d0911ba8b88e84f55f777
 DIST icedtea-bin-examples-3.4.0-amd64.tar.xz 1856216 SHA256 05d187bf937fb162ec828ae7fe214e739d4fb1d237320897eff5e196626c86af SHA512 0ec78903919ad524cdd0d9458c6c2ab437d38f2487807e8854e28df04a8126a43529f22080958e90ec16d7a0d9c72d01570058b383e507b2f1a96b7b7d9578e3 WHIRLPOOL 8dfaed413f1f722458e3b1c5616beacebe65b9a8dbec4e892e0c3b69135a0fbc3c2af2aba19ec0a2841a15bdbab4e051275e1ef84a2c870c6e2c6e11e3be85cb
 DIST icedtea-bin-examples-3.4.0-arm.tar.xz 1840060 SHA256 546f99327d2dc1908a057842781c91693bd92c18663e4af65ab82da929de64cf SHA512 0bd3a13f77e69099b11c0dfee8437b43d64bee4f9ed411af523042c5a53ebff592832e5ff8973bfd9c2858789938b1cabbd230e9b6498721249315b7442a7d9e WHIRLPOOL e9096453f7d8fbde8636981aa140d7606380c05b31d8b1fa03430438f4650bc87dc51e890b8416d2fc06922a8e32f7ce32cb8ef0fdcf89dc0fc6706392904a2b
 DIST icedtea-bin-examples-3.4.0-ppc64.tar.xz 1848048 SHA256 0fe715e84b6f405dc4a24e4c0e958b4691938c12452452747eccee3983c74967 SHA512 89565814818b8a07db3e65b49fd1d750521018ae9acc7800184fe511e327b904fdd6d91c7d7bdf85243685719ee9981abd19d4a727c12b936d75acc57ed80f76 WHIRLPOOL dd8a28b15c32c35c9bdfba9a24b6417ea984c15395de106e432b99dd2874a2aa90abd62aaf11f8ad822418ec1bf0068126c433115ee65b5e41d7fbd062538025
 DIST icedtea-bin-examples-3.4.0-x86.tar.xz 1862844 SHA256 e61b53cb1320492ddadcf428ffc15f9a6178ebcffbeefc2bce8a870021ed809a SHA512 128f6afab5f634bab49c11e41b2e763629a728364031b5e27ab84240878b0c07cabaf94b3b7c43182fd6776a48c341074957b250f036ce42fae84754339282e3 WHIRLPOOL 37f60ac345a34dc708de62b89779eaf010438a18f49d6d3cc07b0bed8c080596e01169185c4d1e8579efa83559bb98d8d0c56694507530d53059dc0bd0105701
+DIST icedtea-bin-examples-3.5.0-amd64.tar.xz 1855984 SHA256 f3a1d8fa74fbd59033dd5a0620053b365d0aeb25b4dadd45925dc068f1a02c10 SHA512 35937f79948a5bd8d38d9934cddc1f4133ffe250d46d2dc62d694e4dc9dab1f72b0f20e989a2758d7c4294ca699ff4435293a2298460c0331f7dd4fa09e4b1db WHIRLPOOL de5923652450574c9fb35028e7c32169f0c7b6bf69c07ccc6c627e2269a9cfaedf0dfb67c761157311b544191379a6e8ab7009523ec7e62c960877cc9b2c1737
+DIST icedtea-bin-examples-3.5.0-arm.tar.xz 1840420 SHA256 3354fcb8099ce044f7ce787a92875c6ae07dd0889fd2057aa275c1bf99f6ad2c SHA512 61d09192257a28235920d0083251aeac1199012afac91c81fc106e868677439fda1a035c4e7df3d50739864381490542e70014d30807540ddaff7a06dba14fa0 WHIRLPOOL 85564fb65cd7248aca234926eda0ff9bea1a097b66f5c9d68bdbedce9a050d23a91ccbe89f7df59bc49acd55250e5dc018b16ee63fd033b36ab9d1dae9022b41
+DIST icedtea-bin-examples-3.5.0-ppc64.tar.xz 1847668 SHA256 74e14f3a145c4fa5fb0cd7cbd7386cc89466ae08b2e1280c8115ea1271b29238 SHA512 cef3f2bff12f66935c3ae3fbd4220711b94842c4edf7acdec4a1ca37247f2b064fa3ec9797fd993a218ebcbd3ae06d7278ce91ffd093c09ca3e5a811972a3964 WHIRLPOOL 1d9cb603e77ff614e414ea7a82e6a5261df66d63d9d356347eba70b375c055378bed332cbff7121bdb0eb3b7fcb1de28c1fe8596c4dae9b951220f5725544e05
+DIST icedtea-bin-examples-3.5.0-ppc64le.tar.xz 1845340 SHA256 67893fb039985a5980a81b47428afc0c6507f63a54aefda66799489d214cbc50 SHA512 e99b1bd97aa6f7113f84cbe67216eebfe8ce3db2fb6e5be52c690a77fb263cacd9763e423de80e69429146e44445fb2743824ee515ab76d75b65b946db081a52 WHIRLPOOL d7a77137ff9f15eecbe6fdd91649b64eb02df56d909d82ca6fe141bd75143d6a9c868898dae295e2fdad648d527304d3f6167ae590dd499f9e699355cd1f8934
+DIST icedtea-bin-examples-3.5.0-x86.tar.xz 1862840 SHA256 3cc1c6515586faafd0155f2b031cf5b765c62d83ba310aa01df37f56a3ab5961 SHA512 2c16cda4256dcb9d6f2b4fd630c2b6aa125e0bfcfa5d0b2144ff38530734ad5cdcd0b6a26015acfd0e89d21b586379779f7fc5050fad531125c3e72bbc45265d WHIRLPOOL 055b74437f2031f4891c0636c7604d75e3084794b462f4f2d5e7154cdda2a8d34e1b757e4acce99f196c76f2c0a38152dcdc0e771dd0c5ea79c5ac5fbcb3c4b3
 DIST icedtea-bin-examples-7.2.6.10-amd64.tar.xz 1796152 SHA256 a50a708e234055912ef8f7374d0d9a86f5dae80efd760ce0c58fb7fb9529dd4f SHA512 f3f2322d6c631130a21320fc4aa82f3c927ef9b877e557adc149d09794c859cd281542b71cacc761516eccf8b5b18ab9a7cd53a37b62cb591c738f5d60fb2301 WHIRLPOOL f47782336d8e6c1539a210f395d7bb999a7fd473ca9ef610fbb873d901a8674aa16bf05db7596a778585cac5de45cc38eb11dd35b5ba620f655facd07df02121
 DIST icedtea-bin-examples-7.2.6.10-x86.tar.xz 1797320 SHA256 2f4de71a29f92b54b151640620853bd71cfa7ee1bd3e4713ed745ada353801aa SHA512 afa5e924bfff796a13e096ef94c708b9192350e86746fe9c86874db2a937add8050daddfba5a50109a6ebc226fa62f66dfc019d27e4053364bfe9249e40a87da WHIRLPOOL 1f6214b2f9fd777ed10a4f5c3f0830f0f3f171d032fffb1ff281f3eea648b9b7994de31fcd7ad65d734bb45d7816819c3d3b34657d52a6b91fa4aea093904464
 DIST icedtea-bin-src-3.4.0.tar.xz 45704380 SHA256 c5a91481c3830148041404785316a203e37cbc3f8673cc97feccff443a4d61a5 SHA512 00cf87bbcb271202aaa08efdb3d804f92a5a8f158f998f689f0360a715485180c767fead34cbfdb8230465427227edf9c16c8779ee010301f25a7a2ad8a06c54 WHIRLPOOL bf80985e409636a0d0bab7849efd48eb19ea8bfaac75663e106129c9b2f511865f3ccaac4cd2a9f2402ae70d905aad2efd6a3edab2dcd0503f423f3ba645d4b7
+DIST icedtea-bin-src-3.5.0.tar.xz 45724196 SHA256 2e41d224208520193e1f7b7f51fad2ff968db742e546ce35d2f135cecaeb74ae SHA512 868074023b4ebd34e398dbb7a89a27ddd1dd8fcafc4f29960da0f6d90f29335796431e5788587d8a5d2d4039f01e8e964f5dd597b89ec8d8f8d014e001ea9052 WHIRLPOOL 827c9818640a34dcb4ab06d7af8cf4ff810dcc8244ff7ce2b9c1c2cace57215d43b991ddffac6bbf94c6d6d808ba6227470628eeb06004965cdc2592ff465c4f
 DIST icedtea-bin-src-7.2.6.10.tar.xz 40201568 SHA256 354b76311fb9e28857dd64c3ca4b53504f5acfaa567d424aa2b24e73b692316a SHA512 c9310a5e776435f2192b046372f051a974e1c9b3be9265a51b344cb46ed82ff4d6cc5870f04ff7a3adb300aadbdbc7b9fda808b890a3a69d7b3ea960a7dddf54 WHIRLPOOL 107b64bfff32317e0439d38a5fbbc79c211048935d00abfebc541e0274123048a59b033e31b07c63156f1726ee127996f4ac0fa95fd5bf2238256bea09fd968c
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.5.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.5.0.ebuild
new file mode 100644
index 000000000000..5aea0a09b8b4
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.5.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri x86)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.6:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.16.0%
+		>=x11-libs/cairo-1.14.2%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.36%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.8%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-5.4.0[multilib?]
+	>=sys-libs/glibc-2.23[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 2e253dc3289f..9c31bac32bd6 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -6,17 +6,17 @@ DIST icedtea-2.6-jdk-11e15e507828.tar.bz2 32873593 SHA256 50d0af5fd5008b6f4b0781
 DIST icedtea-2.6-langtools-6e30439005f6.tar.bz2 1712174 SHA256 02d38317e85b7c10f0cc072c192467a504cf37a2a0d94cddc4347f5c56677653 SHA512 433d6c76aa89365363aeeafe3ba41c4965e75809e8c967cb9a484e8ef1d647e623f7117dc5694885e2d860ae0fa01b20afb0ffe11ae1f5996630c250f931e52d WHIRLPOOL 9556b1cf8487524e123648f65272c4a49d69050b0584378df90e17abda46eccf5122f9fcb2ce50e982350330f89e9e5576ea1517b290a3c4d84a4c3cf52358ce
 DIST icedtea-2.6-openjdk-b3f98f0d4549.tar.bz2 130493 SHA256 b0a9dd2e3c0b3a29d791e49c6e5ea63057380a8eb7574355d4c551986ed7740a SHA512 456ff472161347287812c7a281762f5d80d355dc1851b5887db10acf29a1960ccf2c4cf77d941dd3f92526ed1c327b7da1d2ca9c81adca62b886a92583e61417 WHIRLPOOL 28de0bbe710cd8c1048a869b7eb95fd6084b891b4a796050af9381178f32a010e4db508cabf92aa86d0148caf48536bde9f4de23e0bdd718be5f6b288816d0f6
 DIST icedtea-2.6.10.tar.xz 2106324 SHA256 1c49fd735cc908677044935b6899e59434356b7e65d163bb5033e32f6621a92a SHA512 3b16d5d7f690d96785f3f319964989781eae3668c822b52f9256134ddab4e59261aac187afe1994b74a1d3406d7c5aed40489a49d0a178134a5d9913cd2ea28d WHIRLPOOL e97838675972183d99ea4f6353f3de938c52c8a86116582f33faae54f031426a7feb8ffe129de05b05a55d705df564c2f74645f3ad9f01c4d39f0bc449a58191
-DIST icedtea-3.4-aarch32-b93c39bf2bcf.tar.xz 6743892 SHA256 38e24d556aa269a5168e251b1fa97e84467a722fff27fa2f81de315854f18a33 SHA512 11d25efc36eb776fab3dd411c585d7c3ca6793ac54e17952ed43d22a6928a72fdf4625e836edafb07be3c6ee8612e258c749f5f661d61fb4b90675ed93896e48 WHIRLPOOL a4f931e56b27fab5dfa9a8ff053899b51182407eaa7b6db8a00a83915535b48f241776d7d089b532e6bb89ed629273621c9a65faf71a9efbc095ff679bd7a612
-DIST icedtea-3.4-corba-22ed32f45405.tar.xz 941164 SHA256 47210b6c69dcc6193b9bf0a3d61b75b48f4fa56e8ca348e40200cfa14eca3fd1 SHA512 f0579608ab1342df231c4542dab1c40e648cda8e9780ea584fd47679b07c93508cbfa85f0406d8aa8b9d528fc5bd99c9d41469568fbec41a6456a13d914ac71c WHIRLPOOL cad62367e49620af521d8a7cfb46b2c9d9f0f7b4383b98ceacdc7bebe893afbf8072fb884cdf7cbbfc5dc269279c431cf9b65fd66f00daca1f40a867f0b18987
-DIST icedtea-3.4-hotspot-00b7bbd261c9.tar.xz 6818648 SHA256 973d668f312b869184665def8abe4037dcd78562bf0dda40367102aca647fd76 SHA512 29bc953d283f0a0a464fa150e2c4d71b0adaa29da67246843d230f370b5a20227fb40ef6a7e3b93f10b0cdec18b0cd2bbbceeaea3c9db4d64c158cc23babbad2 WHIRLPOOL 3d37e54360a1c8d0f335b96027a4fc7d1ef0d074e78d08632b0af4ed6e39d2ca1fcdae6033047686cb55c582439ffd96eff04264723dcf20a88b56ba6aa7a4bc
-DIST icedtea-3.4-jaxp-fdc2a6442d2f.tar.xz 2303260 SHA256 c74a8a27f1d2dfeaabfce3b5b46623e367fb0fbd5938a3aca8fcd23eb2ce1d53 SHA512 ef3ed47815e6d15f40c5947fee1058c252ac673f70b6bf7c30505faa12fa5cbab8168d816abe7791dc88acec457744883db4c0af23fb2166bbb709e870685bcd WHIRLPOOL 7ddf8f70d28af3e09f8321590db4422712876bce0ba82c47548ab06d094fc4b2e4a1627387b84e7a331e74d6e315b0baa3fed9a87927e60fac08949cfef6a780
-DIST icedtea-3.4-jaxws-c1bfc2395c57.tar.xz 2270028 SHA256 90642e9131f4c8922576305224278fcae72d8363956b76d4cdbf813027836cac SHA512 867cac2919e715190596ae4f73fa42c6cba839ba48ae940adcef20abfb23ffeeaa2501c4aedc214b3595bc4e2a4eea9fa7e7cac62a3420a11fb30a1f7edc9254 WHIRLPOOL 53d67aed031ad00e1209712936d7fc949602a46f50d1a5b311bb8e325f78a48205aea8159a78ffb67e4d386b8c9185e10315675bf804ae96fac74564822dff15
-DIST icedtea-3.4-jdk-cfc292a2c1c6.tar.xz 39004216 SHA256 ec71e37b98b4baa6831c5cb30bcc1ab18cd95993744dbc4d37a28b2dc5049896 SHA512 180d7b4435e465d68ed0b420b42dddc598c872075e225b8885ae1833fa4ab5034ce5083c4dfba516a21b2d472321b37a01ba92793e17c78e9fddb1e254f12065 WHIRLPOOL 5415d8cf2020ace562eec806afba1aa7b3f2f829223af87760dd938b4c260439bc6d85650dff01e359b7f881c2f51c4e6a4f96645d80ed6782aa6e637a65d479
-DIST icedtea-3.4-langtools-4ef0ee927940.tar.xz 2067092 SHA256 489799c6a86fbfb7da2f2c0ec48e44970a152ea38b97bb40cc04bc09155ab39f SHA512 0663f40b07de88cd7939557bf7fdb92077d7ca2132e369caefa82db887261ea02102864d33ec0fef3b2c80dd366d25dbc1a95144139498be581dfabe913e4312 WHIRLPOOL d0470ec525f6fce10f1f78376f1602c19092d6680a4e70bec64138cc1656c1c51797f47b78fb0c86fa3beccb4321cfa70e44d8afb80a84af982bb0e19d46393d
-DIST icedtea-3.4-nashorn-f2d9bca28d0e.tar.xz 2233268 SHA256 3f3861e7268a3986fa8d5c940b85a0de1003f7ebb212df157a9b421ac621d6ae SHA512 79b5095bab447d1911696bc1e328fb72c08764c0139cab14a28c0f6c2e49a2d96bb06fbbb85523b2586672cb0f13709c3158823d5ac3f3fe3f0f88402d3cb246 WHIRLPOOL cd3c1f26be8986fc395728a884b66f7fb9d37bc7b84089223303ae1291f457d97170541dc99361402d5fc0cdf22a4914f683160d31a13038baf6556c8a08d588
-DIST icedtea-3.4-openjdk-ed5ee0ac7111.tar.xz 337556 SHA256 f1eb8c8e45965adcaa1e9cc70df043a825d52409e96712d266167994ff88456d SHA512 f3cca223bd39c0202dd1a65a38ca17024b6cb5c82d833946ec1b7d28d205833b4dd2dadde505a1c2384e3b28ff0d21a4f175e064b8ac82aa8a07508e53cdc722 WHIRLPOOL 2cbab9e45be95d68f5807d77d24c16487b5d3293fe5419fdebe5f554c1db6caeea5674294b1d92f140886b0d658b5ea5fdca6e5a53acfe5798b8072cc99b8fb3
-DIST icedtea-3.4-shenandoah-6ffe8637a506.tar.xz 6912900 SHA256 61f7cc5896791ae564aa365cb3de80b16426b42f07e5734ebd30c4483fa2fd3a SHA512 0f085e87c63679314ef322b3f4b854792d46539d5530dd75a7fd45b8b6d663f58469be2808ea5fb4bf31f6c5369cb78f28e1599f748e1931ba7040136306eb20 WHIRLPOOL 327c88a3bf3b851c24e6787b9a3039f4153fa9b233f2221c2ec981ee765cbd09f7da4553fac80cf90af6fcd1060f05f627a7f5cb2991812c68582161917c9157
-DIST icedtea-3.4.0.tar.xz 1463512 SHA256 b518f389c44d45bb264d7e954b3c0b836d3d23ba9fbd620ff7c68f934a012e9a SHA512 f5e2c733d4c0acafd92ebeee077997a4639f69d33916895fc82d156c0373a60c485dc8fe9089afc60e19c20f5e83836bbfca73e1a23a77844d47c778062887ea WHIRLPOOL 2098367daf8b4c41e67b00af8f745f0b549f50bab5c7c4b5ad646ab14def7d5604c634ac52c98c5ffbdf848c8bf45d303c212f79d098754024e64d7a47a23f5a
+DIST icedtea-3.5-aarch32-b93c39bf2bcf.tar.xz 6743892 SHA256 38e24d556aa269a5168e251b1fa97e84467a722fff27fa2f81de315854f18a33 SHA512 11d25efc36eb776fab3dd411c585d7c3ca6793ac54e17952ed43d22a6928a72fdf4625e836edafb07be3c6ee8612e258c749f5f661d61fb4b90675ed93896e48 WHIRLPOOL a4f931e56b27fab5dfa9a8ff053899b51182407eaa7b6db8a00a83915535b48f241776d7d089b532e6bb89ed629273621c9a65faf71a9efbc095ff679bd7a612
+DIST icedtea-3.5-corba-e53fedec27e8.tar.xz 937116 SHA256 1dd145802924cf378436bdd3fcb7292c238961ee66a216cc3386b9def42266f6 SHA512 37d42af8663ac0af58c494406360e421dd1f707d98b9a00bb0149a51ccdee809524bc1f307d207360e7bc3f1c0d6a585c085ad0395075a54553226b9fb1874a4 WHIRLPOOL bea4d75147a8b16c4a0b497cc8f79b05564fc9c548c1908720925b2c709c6014c5275981647b5d1f5b61727917df2b0f380f4acd9a126c53e99651ec68741505
+DIST icedtea-3.5-hotspot-24ab92601b89.tar.xz 6818476 SHA256 f156b07a66526d3fa5f8adf17d0f1655359ce8874da9f4cf1d546b7205b0bee1 SHA512 098251daba090465cffebc7fe8486140709726607b93aacd9052a85903fb252aef689611f85deb5324a99e037256cef18a8035fc3d47c8a38b2b47f0e7d1c70d WHIRLPOOL e37712296dd6ceca972b6c34910ca1a361713c4bdea184c994c0ec672a55bd3ea9beb3e218fe366e09b63c68f7bda23c1774397bfc4dd1cb752f590c3c14ee13
+DIST icedtea-3.5-jaxp-a7fb5fa68e85.tar.xz 2296728 SHA256 3c1e16c1223e58f3abfb7987e0bd208153f04c273002777193b1cfa289ea89c7 SHA512 70f9c3c8beb119760356c46c64cc382c783d4aa4f940627169541ea98c07b32af1c67f266a24c6f211e9eb4c37e25a8d124868abfbe7538787a17e66a731f93f WHIRLPOOL d0147f1f3b933aa4ec5f6002a4bb68d3873a889e4006a5a71686755dcabe32cbd85654515bb67bd7fde956d5d4922ba6dd1209b6c438506d18b5c3ed460e860a
+DIST icedtea-3.5-jaxws-8c2ac8bef689.tar.xz 2267392 SHA256 47579cf8bc588d77536fda473f8ecf9597f550a8d541d21a2b90179424a1e292 SHA512 ff10229eeefc1cc08f6f7216b985f092b0bdcc10a33c1c9a962120e93e7ad3d15672b22ac73f3218a59334bf585d8116203d87883f07a5a2a1c2403007fd6720 WHIRLPOOL 73560cc7bc8fd59b55c444b309842d7e79223838cdf9db480d44d005de4560246e12bc2b1eb645f8f73cadbde1f4a45f98d9ff94d6ede6f1ae95641e23fc1518
+DIST icedtea-3.5-jdk-bdf93656feba.tar.xz 39030960 SHA256 19908a408068f3cf0ed2a391a2e711e3d0e8e91072b8005093c7b2b8015a95e3 SHA512 caeafb2efdfb6cacedab1fe13f23822baf5dcd599403a4cc057e6814d224cdf2ec5cdfb8c55ab8a5efb1e0f68b2d784226431a54e3711aa99dbee4ac20ef60fa WHIRLPOOL 5dea12cd291c932eb34f3895722a5a01d0185add4093552a3b8544d702b75a3944be3dc4ad1b8645c528c33efb48bbc423fff307c7d34800cf3ca9739595a0f3
+DIST icedtea-3.5-langtools-0456f88e5c29.tar.xz 2066416 SHA256 49fd3c277600bd125d113c36fa16762c6ef620aca5aaa593dd0cee98af88b79c SHA512 8260e326b3aa42f8ec9de18a7b8eeaa52b2610f63426d7a1a143a7f27b849c60a9a47397de565bc3fb0e9761178e2cb68af15c996d848e20f5016111dd22a4cd WHIRLPOOL 3f9294b54db153d5db2b783b9ae993657f5507ca333f3142148e00827eea0eb749c9bd816e1be1e350d4809740476da717a6ecd08421eb4784b0d829bb915688
+DIST icedtea-3.5-nashorn-6743b468dda3.tar.xz 2230868 SHA256 f995d94f726e74030c414cad2da5401afddf0606a21ecbedce90cfb48abbf54f SHA512 ac0c7adce68d3e85bd708b055b8a1661ac9a24301a10c009f030be947d194cf8f7cf856923ddfc29b6c2d61ea62d7fdfc260abc4664fb0f3bdaf1e9ecdc767d7 WHIRLPOOL eb3445fc34438b4b136a20902189f3bb2e1b907d53465437c99f2bda51ababe71351bbe32e6a09eab0189f1048663c42dc217eeb6c106f955d771f290c7eff66
+DIST icedtea-3.5-openjdk-ee1282876d8a.tar.xz 333272 SHA256 557380dfe3b19fb73de62a51867528b1a0c982c0c1b9aae7cde6061d7d7d2736 SHA512 88f6dabebe20f9feedf1de69c486fb8d1d4239b25f845c998c64cf6f1f783cf86cc98feb87f50a5256a2a340e23d2d3452827c39a65e371e54477479ee2b7be4 WHIRLPOOL ddc4d83cffa7e6c549b9293b5833683eb4c8632b69790c6c2d46b1f26a7ae5c3167c4381a03737b3d182eba6c952eb6b893b785b8e455bd80ac572830d2b0e3a
+DIST icedtea-3.5-shenandoah-098a7fa49b3b.tar.xz 6918936 SHA256 911716c41b6b86d51679e0a3e0fbb44ef6b2e14c4507b983f77f09294b2d4c4e SHA512 2f9c3e4c38f2d5f76b5c16d07860ea125ee60d2c93d56832cb0f061633506ccf261a2a4357da7bb23298d20304cbcabe98d2c2083e63c958e2ad1271820f0b7c WHIRLPOOL 9c6847dcb9aff33b3b897df4a41a4d9af2b6cf0b7bb21b214f4623140288770004d3d62b234e6ad4078393d91db6d7322c2971b24054ce8e63de164824b12c93
+DIST icedtea-3.5.0.tar.xz 1489740 SHA256 9aa89e00ecc07baa6b37a6b1e363c3d7128253e95374c74d1d2706f36c3ccab5 SHA512 7bec56fc5c83009107a094be786f4bb86f5bd072fd89b880f5bbeb67a6e5f607fe43d8daa0d616489b0cfd2e4bc5667190b8d49aa298b3475693793048d70d1c WHIRLPOOL 9ba2db1ea17873ccbd999dbbaead8899dd2cc8163b6c82275abc3c0472e9afd948ae8664f56beeee18179573163e7e457559ed99f4718f5c83e80312b9d2b9a4
 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
diff --git a/dev-java/icedtea/icedtea-3.4.0.ebuild b/dev-java/icedtea/icedtea-3.5.0.ebuild
similarity index 97%
rename from dev-java/icedtea/icedtea-3.4.0.ebuild
rename to dev-java/icedtea/icedtea-3.5.0.ebuild
index 041baa554410..598efe9fa628 100644
--- a/dev-java/icedtea/icedtea-3.4.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.5.0.ebuild
@@ -13,15 +13,15 @@ ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
 
-CORBA_TARBALL="22ed32f45405.tar.xz"
-JAXP_TARBALL="fdc2a6442d2f.tar.xz"
-JAXWS_TARBALL="c1bfc2395c57.tar.xz"
-JDK_TARBALL="cfc292a2c1c6.tar.xz"
-LANGTOOLS_TARBALL="4ef0ee927940.tar.xz"
-OPENJDK_TARBALL="ed5ee0ac7111.tar.xz"
-NASHORN_TARBALL="f2d9bca28d0e.tar.xz"
-HOTSPOT_TARBALL="00b7bbd261c9.tar.xz"
-SHENANDOAH_TARBALL="6ffe8637a506.tar.xz"
+CORBA_TARBALL="e53fedec27e8.tar.xz"
+JAXP_TARBALL="a7fb5fa68e85.tar.xz"
+JAXWS_TARBALL="8c2ac8bef689.tar.xz"
+JDK_TARBALL="bdf93656feba.tar.xz"
+LANGTOOLS_TARBALL="0456f88e5c29.tar.xz"
+OPENJDK_TARBALL="ee1282876d8a.tar.xz"
+NASHORN_TARBALL="6743b468dda3.tar.xz"
+HOTSPOT_TARBALL="24ab92601b89.tar.xz"
+SHENANDOAH_TARBALL="098a7fa49b3b.tar.xz"
 AARCH32_TARBALL="b93c39bf2bcf.tar.xz"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index a3661dcea5d1..636d6cbc5085 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -10,3 +10,5 @@ DIST rust-1.15.1-i686-unknown-linux-gnu.tar.gz 103889253 SHA256 a93436b969d19a65
 DIST rust-1.15.1-x86_64-unknown-linux-gnu.tar.gz 101140146 SHA256 b1e7c818a3cc8b010932f0efc1cf0ede7471958310f808d543b6e32d2ec748e7 SHA512 e089c455b1a7507aeed4652f05c0672c4e996e708c46f4405191f4b3a9d08403cab27f1a5a63f865d9a8f099f6ca980d2d2eef37aaa5e7e5bd751a3224e88b84 WHIRLPOOL 8983a5135bb34a6f54c8f015e8a02c2d9bd9c126589659b68fa57a8de928524af5a427b950f944d68ea80264e8acb54810c548b18910036ede080c1c8371a081
 DIST rust-1.16.0-i686-unknown-linux-gnu.tar.gz 106129219 SHA256 b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5 SHA512 7a780a107d98c6a8883f95dbb5a5ec95bad52fb1e735afba29b47411b450d464cbc8dfe73d35de1eb18b9a1f9ea727daa1ca9d3042e2a98c67ad570d328e139d WHIRLPOOL e7cbcfdb984a76ce8c7885cde6380582f75205ec498db904ccbaf7fac891caf7d1ef377c67e40265cdd998ad420d6cc55cf2a989abb167da0285d24319a36bd6
 DIST rust-1.16.0-x86_64-unknown-linux-gnu.tar.gz 103142459 SHA256 48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd SHA512 f3d381c0e47e0af02eb116376422c3e48295c2854c6ad8c03d4c13e662f3cc1fdddf25923f7b3ef358c5cf670ed67d75e2197162434a81d5f9499e6e0e2d1054 WHIRLPOOL db9547a3b92471d5f46b431fc6c66d12cb2bcda22d548993904a03485f729b4a0f91813dbf2a5b3f46c9aeb0ca39332db1f95454cabb9f0684e4142fe3bfdcf3
+DIST rust-1.19.0-i686-unknown-linux-gnu.tar.gz 143010900 SHA256 657b78f3c1a1b4412e12f7278e20cc318022fa276a58f0d38a0d15b515e39713 SHA512 a41bc6b576e04e4ced66c69524eedca6528b8a559c4877408be590d48ce4c77f6157f9adbc9e87e209f3e2d21ae105305195dbbfbf519f8df88a1615b49b3b0e WHIRLPOOL 1e6bbae9eb6d0ea7418acb64b7fa49fb1abfc15cf320e4ff27f538bfe721883d5e7acde63854998851870bb6491b5b1babd99e83de8ebee67864b852d54043c1
+DIST rust-1.19.0-x86_64-unknown-linux-gnu.tar.gz 151087058 SHA256 30ff67884464d32f6bbbde4387e7557db98868e87fb2afbb77c9b7716e3bff09 SHA512 fc98ad7728a72c9bc93505458f7558405cc6a608eb19aa6c609e0155e7c081123f116cf023d19af2f0cd9cb81b8e1bbe69efd88f7bb61cca2d258d5fa2ed6bba WHIRLPOOL 51a5e1534e8d0fcab7bb5d5f2b247251b333dd565c320441a76d7004acb9b808e8c13169b1d8a99d5639f9e4311d938731396a3d1ea263d2d52ce8889e247e22
diff --git a/dev-lang/rust-bin/rust-bin-1.19.0.ebuild b/dev-lang/rust-bin/rust-bin-1.19.0.ebuild
new file mode 100644
index 000000000000..319576f891af
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.19.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils bash-completion-r1
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
+	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	!dev-lang/rust:0
+"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="
+	opt/${P}/bin/rustc-bin-${PV}
+	opt/${P}/bin/rustdoc-bin-${PV}
+	opt/${P}/lib/*.so
+	opt/${P}/lib/rustlib/*/lib/*.so
+"
+
+src_unpack() {
+	default
+
+	local postfix
+	use amd64 && postfix=x86_64-unknown-linux-gnu
+	use x86 && postfix=i686-unknown-linux-gnu
+	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+	local std=$(grep 'std' ./components)
+	local components="rustc,${std}"
+	use doc && components="${components},rust-docs"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${D}/opt/${P}" \
+		--mandir="${D}/usr/share/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	local rustc=rustc-bin-${PV}
+	local rustdoc=rustdoc-bin-${PV}
+	local rustgdb=rust-gdb-bin-${PV}
+
+	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
+	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
+	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
+
+	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/opt/${P}/lib"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index d3d670c1ccff..175eba30eb8a 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,6 +1,13 @@
+DIST cargo-0.19.0-i686-unknown-linux-gnu.tar.gz 5068212 SHA256 30ffc32615626b746cbdd2c34d79b3de8ae9889ae56ab33feed9c3a1b9c170fc SHA512 bfe5df682eb566c91995b8c00b5e8edb5d2c3410d1baa5be2ede2e39260b653d34b7723c6c3e8f07d8102ffab50b13e62f9f2d816dad8fba9f39b7bec984181e WHIRLPOOL 3a2c9f36470f611dbd4d8e48c94b401d584b25208abafa1a1073eca33009185e37d92a3f59200027bcfb82bb50acbf5acf4aa87649360afaba7d380bdfcffff0
+DIST cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz 5133993 SHA256 24d5e01b09ba0fb15c4b7ef4f527aca874ce2e0cebc3850fdc2535ac7e25b205 SHA512 6fedb8f83d70dc4fb93a29d400577a5578ceed1448f4e85e8a9509b98b037a125532ebfb6a7e6bc9411501ea74774d2c47ac7e2bcb7ac82baeb925abc46609e8 WHIRLPOOL eb76664d0ac08389beb9feae5f6d603b6846cb3d21f015e97bf702789afa7cedd4cd1fb04594d48af8840dece0bc9c44c74fb84390c5b24dcb5061567b59737f
+DIST rust-std-1.18.0-i686-unknown-linux-gnu.tar.gz 66316236 SHA256 3b93c7b856b98f61ec0f640bc96373f4762484ab3340866902c8c96933bcf10b SHA512 0649743437f15d80f7fe08ae32177b36e2a89e87db8062433cfa6d0f62fe7e8fdbc109a025c02dc110d8abdf4b74ddfe80ba8fb895992b0f5ac6a880bbbdf051 WHIRLPOOL 668f41c1fc96083c974b62ce831c254b8707fc7a452e55927ed77943548b829ff8164618ed5bec29f766366af8682e4d91edd9cd0d615bacc9d47c610f8bb87e
+DIST rust-std-1.18.0-x86_64-unknown-linux-gnu.tar.gz 75723132 SHA256 4a66150781e224412ebd9dd6d643ad65ecc5668a7754e4a12e115be6ce7bf527 SHA512 98f50016cf6f7c89f90830e1c9f41b5413adf2eaa5e2874ca117ffe84ee59fe77cb461ca3601ee65c5c5c884eb42e22509a94c00544527c727f2e3d6d0adb530 WHIRLPOOL 0c08c956be2252f25098d2007a5d57d4e74b3ef9fba47a0b3e291db9575cf41986d89a8b24f6966f73c830b52d2a481a6248deec9a6502baf3fa5b79afe2c342
 DIST rustc-1.14.0-i686-unknown-linux-gnu.tar.gz 51391277 SHA256 52b7df5025c302d82f0572fbdc74309334bad36e796c4a2fdf934abe2e5e23ac SHA512 4a951439d8c001b8ff2f6aa2f505e23130209494026fdacea019aef05bebb2f0d3404df047ccedbe9f4140cb5163404db22a5b0977752c495fc45f739d1252fb WHIRLPOOL 881f1a042568d55a3826f629ddd04642dbbfa3a7f423bb3c1d4e1d4e73fa31fe34c708b718b5d44cdd34cc71f99243de98f1478d880ff5804375bbc33ff4766e
 DIST rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz 49370951 SHA256 0eeec4211aa872f24c220200a0c2b095bbfc9c0f737c1c5df2555967c8f36787 SHA512 da33a8c509d3a554bed3173f8cdd6fc3639646e5b12eae80654d83290160227238c6f9ff9c0247d63a90f48eeafc8dc31a4a02575ba43fa6d5f75ae58a347c32 WHIRLPOOL a5aa3eb98b0b6b080057a4c5ffb00996904d3a6bb660297a984205f85e9fd6932f9e9c6c4d4fe60a8ca16a216304ab6e504a45b75b876408a8f3450f29872332
 DIST rustc-1.15.1-i686-unknown-linux-gnu.tar.gz 39314075 SHA256 a833304f99071600c72ecd868c1c7bd5ce49d1102332637a8eb7adb942f349ab SHA512 138a4a893a70860650da1636f734977c215e32b1f9b15b957bfc31575d2662ea6c2c65a130bd13647ec1f2366fe0deb26a94ea09aaec7cbda8e466fa295a0c42 WHIRLPOOL 175e1c7ae1352b955c4e9fc3ea2175e91fe9037e356898fc7dc61ce55f5932db6cf4efac834cecc95b6c90c411b57f0ddb398e9b1f3af843a77f1fd84d52c36b
 DIST rustc-1.15.1-src.tar.gz 28100203 SHA256 2e7daad418a830b45b977cd7ecf181b65f30f73df63ff36e124ea5fe5d1af327 SHA512 10d533b17cf7f92b9dff14b399b5dd0ac8b68284eea072c85ede78a4e4c2c4fce8c781777124c64798057aceb6444535e02e067fd67ba3633c3e828fb4d2d339 WHIRLPOOL 8b80298cd0a8c3ae0f7ad11052e2dd0bd48b589a95e4bbda4db32ac62d52f9252fe783d46b00484550099b99c3871bd577f8ef54ed45c20b477f9742220497fa
 DIST rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz 37650863 SHA256 33ff44672b731fc71145974ce84194a1a9bafe6da3a74fd1e7543f12467f8894 SHA512 97f2fd905b1c2c9ee1fb9a9604a931154aa928692e6334af5a60f1853e49246b13af26afb6342f085cf77e624f23e90c409f05b81983408cf0538ba1401ef7cb WHIRLPOOL 92d4659712a3c8c5908f2abff4f582233a2b5aea2256213376f4830aaddb8470257e49d9f65503e7d82845648a898fd980afb070c39c37feaf8d489fdd9e238e
 DIST rustc-1.16.0-src.tar.gz 28470372 SHA256 f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4 SHA512 096b1b7406be9bc61161bb7cdd2061f2bc2174c161a31f4ed6ceecf7fc379f315fc2f7cb9f6c134ea4f8519c27bf6e5a3f712cf1e56d5785831d8c8374eb0ba5 WHIRLPOOL a59a19b63d64fd98d4f488e465c7a89ca034eaddb3ef6272fe3ab6c3e411afb7ca3b34926201815ce208a5de78dc9e9018caa1d05b71d1cbc80912d46eb8b074
+DIST rustc-1.18.0-i686-unknown-linux-gnu.tar.gz 47281118 SHA256 0cb9bb95373cee8ba26e8f517c46f8c58a29e22f2c7c08a4d152306c6ffc7115 SHA512 e270a314fb326fb226226741a5a15f237846ffb7ae6e0ab349f56328f5b3557d8b3dfdcfbc168f3ed4d9875806434537ce7bd5fb97b2c3078f7d03fd6ce65d2d WHIRLPOOL 598aaa0c8ded68fdddd28f827b07e3841355e1ff67aed20d31cc7728fc351a95e8c521661487905fba0689c0513b5f3baf31ed34cfae5f396731a5e72da2067b
+DIST rustc-1.18.0-x86_64-unknown-linux-gnu.tar.gz 45281645 SHA256 f2a34e20166ccf6eda4de46a9efb02821df5c3f34667e2988284a8eaee408113 SHA512 7d8865a43b979150c3dc3abaa852921f46bebb54659bb0f14bc9b82b367f94ec031da4d03242cb6aae8bd11167402b9e166a14aa3c4a141413be54e9a685af31 WHIRLPOOL 0dc7b498701e3d40b3242e7860b6b5b6ccdd437d0e1d0a6c492fd6b7fa539800b6722e2da124b8ba9568beccc34e83cab080045f41450a4fb5a123c99f6136fb
+DIST rustc-1.19.0-src.tar.gz 50108626 SHA256 15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51 SHA512 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24 WHIRLPOOL 1dabcc0966a2e69f6c8105e39b82f31bc1c64803318c3a82f63f82afbc67e566d6969568678e86079e1fb515f73feb23d981920c232d836d297abf58010612fe
diff --git a/dev-lang/rust/rust-1.19.0.ebuild b/dev-lang/rust/rust-1.19.0.ebuild
new file mode 100644
index 000000000000..ce67be791546
--- /dev/null
+++ b/dev-lang/rust/rust-1.19.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+if [[ ${ARCH} = "amd64" ]]; then
+	TRIPLE="x86_64-unknown-linux-gnu"
+else
+	TRIPLE="i686-unknown-linux-gnu"
+fi
+
+CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+STAGE0_VERSION_CARGO="0.$(($(get_version_component_range 2))).0"
+BOOTSTRAP_DATE="2017-06-08" # found in src/stage0.txt
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="amd64? (
+			https://static.rust-lang.org/dist/rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+			https://static.rust-lang.org/dist/rust-std-${STAGE0_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+			https://static.rust-lang.org/dist/cargo-${STAGE0_VERSION_CARGO}-x86_64-unknown-linux-gnu.tar.gz
+		)
+		x86? (
+			https://static.rust-lang.org/dist/rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu.tar.gz
+			https://static.rust-lang.org/dist/rust-std-${STAGE0_VERSION}-i686-unknown-linux-gnu.tar.gz
+			https://static.rust-lang.org/dist/cargo-${STAGE0_VERSION_CARGO}-i686-unknown-linux-gnu.tar.gz
+		)
+		https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clang debug doc libcxx"
+REQUIRED_USE="libcxx? ( clang )"
+
+RDEPEND="libcxx? ( sys-libs/libcxx )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.0
+	clang? ( sys-devel/clang )
+"
+
+PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	>=dev-util/cargo-${CARGO_VERSION}"
+
+S="${WORKDIR}/rustc-${PV}-src"
+
+src_unpack() {
+	unpack ${A##* }
+}
+
+src_configure() {
+	echo "No configure step for rust"
+}
+
+src_compile() {
+	local stage0="rust-${STAGE0_VERSION}-${TRIPLE}"
+	if use debug ; then
+		local optimized="false";
+		local debug="true";
+	else
+		local optimized="true";
+		local debug="false";
+	fi
+
+	cat <<- EOF > config.toml
+	[llvm]
+	optimize = ${optimized}
+	assertions = ${debug}
+	[build]
+	docs = false
+	submodules = false
+	python = "${EPYTHON}"
+	vendor = true
+	[install]
+	prefix = "${EPREFIX}/usr"
+	libdir = "$(get_libdir)/${P}"
+	mandir = "share/${P}/man"
+	docdir = "share/${P}/doc"
+	[rust]
+	optimize = ${optimized}
+	default-linker = "$(tc-getBUILD_CC)"
+	default-ar = "$(tc-getBUILD_AR)"
+	channel = "${SLOT%%/*}"
+	rpath = false
+	optimize-tests = ${optimized}
+	EOF
+
+	local cache_dir="build/cache/${BOOTSTRAP_DATE}"
+	mkdir -p ${cache_dir}
+	for i in ${A}; do
+		cp "${DISTDIR}/${i}" $cache_dir/
+	done
+	${EPYTHON} x.py build || die
+}
+
+src_install() {
+	default
+
+	local obj="build/${TRIPLE}/stage2"
+	dobin "${obj}/bin/rustc" "${obj}/bin/rustdoc"
+	dobin src/etc/rust-gdb src/etc/rust-lldb
+	insinto "/usr/$(get_libdir)"
+	doins -r "${obj}/lib/"*
+	dodoc COPYRIGHT
+	doman man/*
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/usr/$(get_libdir)/${P}"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch b/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
new file mode 100644
index 000000000000..5221b4e43f2b
--- /dev/null
+++ b/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
@@ -0,0 +1,60 @@
+From 12fb11f46a7eb4054b74679a6f5ad12dcc41132d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
+Date: Sun, 23 Jul 2017 20:46:19 +0200
+Subject: [PATCH] Control build of demos
+
+Building demos is not necessary for distributions. Allow disabling it
+but keep it enabled by default.
+---
+ Makefile.am  | 2 ++
+ configure.ac | 7 +++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0e4cf631..8c0c7143 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -635,6 +635,7 @@ endif
+ CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
+ CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
+ 
++if ENABLE_BUILD_DEMOS
+ # Demo programs
+ noinst_PROGRAMS = \
+ 	demos/youtube/youtube-cli \
+@@ -650,6 +651,7 @@ if HAVE_GTK
+ noinst_PROGRAMS += 			\
+ 	demos/scrapbook/scrapbook
+ endif
++endif
+ 
+ demos_docs_list_docs_list_SOURCES = \
+ 	demos/docs-list/docs-list.c \
+diff --git a/configure.ac b/configure.ac
+index 3b0530c3..1e09f277 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -152,6 +152,10 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE])
+ AC_SUBST([GNOME_PACKAGES])
+ AC_SUBST([GOA_ENABLED])
+ 
++AC_ARG_ENABLE([build_demos],
++              AS_HELP_STRING([--enable-build-demos],
++                             [Enable building demos (default: yes)]),,
++              [enable_build_demos=yes])
+ AC_ARG_ENABLE([always_build_tests],
+               AS_HELP_STRING([--enable-always-build-tests],
+                              [Enable always building tests (default: yes)]),,
+@@ -161,6 +165,9 @@ AC_ARG_ENABLE([installed_tests],
+                              [Install test programs (default: no)]),,
+               [enable_installed_tests=no])
+ 
++AM_CONDITIONAL([ENABLE_BUILD_DEMOS],
++               [test "$enable_build_demos" = "yes"])
++
+ AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS],
+                [test "$enable_always_build_tests" = "yes"])
+ AC_SUBST([ENABLE_ALWAYS_BUILD_TESTS],[$enable_always_build_tests])
+-- 
+2.13.2
+
diff --git a/dev-libs/libgdata/libgdata-0.17.8-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.8-r1.ebuild
new file mode 100644
index 000000000000..9a28a56d4cd7
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.17.8-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 vala
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/22" # subslot = libgdata soname version
+
+IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
+REQUIRED_USE="
+	gnome-online-accounts? ( crypt )
+	vala? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/json-glib-0.15
+	>=dev-libs/libxml2-2:2
+	>=net-libs/liboauth-0.9.4
+	>=net-libs/libsoup-2.55.90: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:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	test? ( >=net-libs/uhttpmock-0.5 )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-disable-demos.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-build-demos \
+		$(use_enable crypt gnome) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable static-libs static) \
+		$(use_enable test always-build-tests)
+}
+
+src_test() {
+	unset ORBIT_SOCKETDIR
+	export GSETTINGS_BACKEND="memory" #486412
+	dbus-launch emake check
+}
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 2ab11ca65048..b41f473ff882 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -2,3 +2,4 @@ DIST libpipeline-1.2.5.tar.gz 779072 SHA256 2de10806d9b7dda54f4098d2c12e36e960b9
 DIST libpipeline-1.3.1.tar.gz 787711 SHA256 5cad1b446f135ec3800d32c8c951a1114f4c438609a4c52b262c30301bc8e692 SHA512 0f903f9a268eea7c6d1ddef1210a729d32b423abdbf1e150aaf6705a272dfbcde482302cb06366ce317674bc681c7e3305cd35a83eb3f0451d1c5595f5c6ac5a WHIRLPOOL eb3fc4a337e09552f3e58a06bcbd9ed30d6b95a60b6cadc293e7aceb77a99e488c8c77a757dd93968a48b4fc72d024227fbe176d8ac7a386172bc50b51e54ef2
 DIST libpipeline-1.4.0.tar.gz 805155 SHA256 79c759e7fbf17b560a72edce3ff9bb308d7720306c2650e4fae541daabb89bb6 SHA512 0dce585f9d7aea91889804fd7a65a549b41730add0f6156bf8d0409762fed9c29e8843426e8136c9e0a0348734acaabb48ceede1e3e4d9071d4d787d0b8d46f3 WHIRLPOOL 2ba46823c6eacbe7b4a15d135448b2c59c65c431f438d22f1709bea85d819f4358fd685fab00d0e24cf281e92476b8c48aee61e7b406dcd8e142b2e4fa50bf86
 DIST libpipeline-1.4.1.tar.gz 805172 SHA256 da46d7b20163aadb9db2faae483f734e9096a7550c84b94029abeab62dd1b9ee SHA512 835d65aa3f9436398b5421544ca7857fe9caed52cd2e70320ea04d6315825e648df930e1c225d4aaf0f2edda2a438f6c00f15c556fb9fd30311560fb8d966797 WHIRLPOOL 1b6688f0388489f015a95397ec6ad34338654bd40c05bc15f30cdbf2e4ad5b1fd53d20f56a6763d398562f39986abf6675236395215bc5819573162eedf17de0
+DIST libpipeline-1.4.2.tar.gz 827362 SHA256 fef1fc9aa40ce8796f18cd1aecd888a9484a9556c8b0f8d07c863578277679be SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02 WHIRLPOOL 56b81f7572d21be35cfa82d6fcb3bd9321016a400c619b97d71de1e1740070647e3e8c8e810e6547132ecb4e2ecbbef9ec37fab4ae8b1669f51e69613d2aa9a4
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
new file mode 100644
index 000000000000..f20ee35aaa85
--- /dev/null
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools-utils
+
+DESCRIPTION="a pipeline manipulation library"
+HOMEPAGE="http://libpipeline.nongnu.org/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs test"
+
+DEPEND="virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-gnulib-cygwin-sys_select.patch
+	"${FILESDIR}"/${PN}-1.4.1-gnulib-darwin-program_name.patch
+)
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild
index 1111b265a09d..9530a585bc91 100644
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="suid"
 RESTRICT="test"
 
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 2916650e788f..d7fb939cc727 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,2 @@
-DIST serd-0.18.2.tar.bz2 291053 SHA256 8e3d8402c33fa217572d3ee936919037420fb237fb8603a7b024ab482a94eac1 SHA512 2e775f50efbefa88d291999a26bf8e6602b5791affc9b9073451eb1406db654a63d2b91eb862ba7e714b5ce9ad51f7b7b259714476cd1532cf17fc072a923c3f WHIRLPOOL 85d8599a3c4f1c26d438b741b70f75b0c3b7265a973b93bafa45f59f3a669b664d979ff49f9894f36c76d1c1826818222a089051b7202a71b85f30d2cba80980
-DIST serd-0.20.0.tar.bz2 363807 SHA256 64515f4f5eb27ba2ba151027a72a77672f6ee8a2a3b58991ad5c045135feabbf SHA512 d313abb6423b0b1dd30b5c4f7ede45a5e51b3c8676b49215e106a75d73280e07c48b3895f2d88aeac2117eaf9c82cdb58bfc530895ad17a34d810c256868d1ef WHIRLPOOL 0cb4e6b9c870cc2bf5a34eb5c25a4a5fbcc90737ac646688338b9529baa774da29cd9f8659cdcc8f13e714949ea0ed840af28ed81a869465f8902b3e24cbeb27
-DIST serd-0.22.0.tar.bz2 340371 SHA256 7b030287b4b75f35e6212b145648bec0be6580cc5434caa6d2fe64a38562afd2 SHA512 532f9bcf1edafb4fb74c521c11e3582133096068c883ecdfb97483c1344de6c2effc7cef8efa0c5d919667d5ef51e3f62af0a02faf0d518216e0746933a859d3 WHIRLPOOL 11e3757a322b578ee648e53774d0390de4b295f5f8c187a8f7dc6bc59249845d890548324107b7c9dbf03ab851a61e9e71f5997e1fdefafeaf5610350292d58f
-DIST serd-0.24.0.tar.bz2 346615 SHA256 8cfb8ade8d9a6f784da6e00ac05a28b7de440df5d2513796cd34aaa2754f6a6c SHA512 c62e869c584340ea5ea9f2f52a279281f792770ae4ccdde5a5355b23f428e5f8a32e29c3bd521d2a846d62e17b691758764dbd814b9b67203e264be2fe5a81ed WHIRLPOOL 7e1c171726c814b1546c95521de49295ea468fdc31534f556eada6edd9596d83b147d18b9eb1cfa07e42f508982a93962ecfd5bbd140abdc1bfe6cf0cfb7da42
 DIST serd-0.26.0.tar.bz2 369280 SHA256 e3e44a88f90a9971d55e6cbd59a7b9cfa97cfc17c512fed7166a4252d5209298 SHA512 749bf161d38cb8489f196ece2bf2b7c22e9113d05b38452592d92f9ffdec25d340e680e697e9531dab80d2ef04600690f9333208a4ef22307b8ed8e238d5c7b8 WHIRLPOOL 04d79bf1ae348690fcb96dc8adee4cc32b48c3163d08684acdc6f70704228af5138f1718d9b5a26ce6b8c8e1d134ecdce6694266e3e6f6517973f36db90996c3
+DIST serd-0.28.0.tar.bz2 371592 SHA256 1df21a8874d256a9f3d51a18b8c6e2539e8092b62cc2674b110307e93f898aec SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e WHIRLPOOL ceebbd0068e659438571d61d9cbd192b8de1524a11b285738ee8697ff3b31f22db84b2908f06f67f7b3f764f246f2eb67abf04a4e77d40e101eac7eb0306dbf4
diff --git a/dev-libs/serd/serd-0.20.0.ebuild b/dev-libs/serd/serd-0.20.0.ebuild
deleted file mode 100644
index 02a454c58896..000000000000
--- a/dev-libs/serd/serd-0.20.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/serd/serd-0.22.0.ebuild b/dev-libs/serd/serd-0.22.0.ebuild
deleted file mode 100644
index 517da9ebfb4e..000000000000
--- a/dev-libs/serd/serd-0.22.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/serd/serd-0.24.0.ebuild b/dev-libs/serd/serd-0.24.0.ebuild
deleted file mode 100644
index 13940a2c59e4..000000000000
--- a/dev-libs/serd/serd-0.24.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
-HOMEPAGE="http://drobilla.net/software/serd/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( "AUTHORS" "NEWS" "README" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use test && echo "--test") \
-		$(use doc && echo "--docs") \
-		$(use static-libs && echo "--static")
-}
-
-src_test() {
-	./waf test || die
-}
diff --git a/dev-libs/serd/serd-0.18.2.ebuild b/dev-libs/serd/serd-0.28.0.ebuild
similarity index 86%
rename from dev-libs/serd/serd-0.18.2.ebuild
rename to dev-libs/serd/serd-0.28.0.ebuild
index 517da9ebfb4e..72a8bf533c1a 100644
--- a/dev-libs/serd/serd-0.18.2.ebuild
+++ b/dev-libs/serd/serd-0.28.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils
 
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )"
 
-DOCS=( "AUTHORS" "NEWS" "README" )
+DOCS=( "AUTHORS" "NEWS" "README.md" )
 
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
index 51d32b0f4eae..a829fc1832f6 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
@@ -20,7 +20,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 )"
 
diff --git a/dev-libs/xapian/xapian-1.4.4.ebuild b/dev-libs/xapian/xapian-1.4.4.ebuild
index c46388aaa89e..ece496854144 100644
--- a/dev-libs/xapian/xapian-1.4.4.ebuild
+++ b/dev-libs/xapian/xapian-1.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xmlsec/xmlsec-1.2.24.ebuild b/dev-libs/xmlsec/xmlsec-1.2.24.ebuild
index ce5133a74abb..2a7a4fa379a7 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.24.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc gcrypt gnutls nss +openssl static-libs"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-ml/angstrom-async/Manifest b/dev-ml/angstrom-async/Manifest
new file mode 100644
index 000000000000..693923160ef2
--- /dev/null
+++ b/dev-ml/angstrom-async/Manifest
@@ -0,0 +1 @@
+DIST angstrom-0.6.0.tar.gz 80393 SHA256 9080c6ad32ee5c31ae5b754370328daa5febb219ae2a1e8390fb469622dca7ee SHA512 4b03022f3e8147075653a9740473ce23fc42ba8c559f1b86311132fa1a09cfac0f044cb3a8c9fc2d97f4acef35806b4742606b0af22d6b07058e8a78c6672618 WHIRLPOOL a79f7e522e645b605eabb155c604cf6e2e435e9325551a22efbe5c1b12f57726c8ccdad510ef618cc510b409acc6cb86204630ecb4cf1af6d1adc628bb19dd33
diff --git a/dev-ml/angstrom-async/angstrom-async-0.6.0.ebuild b/dev-ml/angstrom-async/angstrom-async-0.6.0.ebuild
new file mode 100644
index 000000000000..71eba82e1582
--- /dev/null
+++ b/dev-ml/angstrom-async/angstrom-async-0.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/angstrom:=
+	dev-ml/async:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/jbuilder
+	dev-ml/opam"
+
+S="${WORKDIR}/angstrom-${PV}"
+
+src_compile() {
+	jbuilder build -p ${PN} || die
+}
+
+src_test() {
+	jbuilder runtest -p ${PN}
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		--mandir="${ED}/usr/share/man" \
+		${PN}.install || die
+}
diff --git a/dev-ml/angstrom-async/metadata.xml b/dev-ml/angstrom-async/metadata.xml
new file mode 100644
index 000000000000..6a85d809eb32
--- /dev/null
+++ b/dev-ml/angstrom-async/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+  <upstream>
+	  <remote-id type="github">inhabitedtype/angstrom</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/angstrom-lwt-unix/Manifest b/dev-ml/angstrom-lwt-unix/Manifest
new file mode 100644
index 000000000000..693923160ef2
--- /dev/null
+++ b/dev-ml/angstrom-lwt-unix/Manifest
@@ -0,0 +1 @@
+DIST angstrom-0.6.0.tar.gz 80393 SHA256 9080c6ad32ee5c31ae5b754370328daa5febb219ae2a1e8390fb469622dca7ee SHA512 4b03022f3e8147075653a9740473ce23fc42ba8c559f1b86311132fa1a09cfac0f044cb3a8c9fc2d97f4acef35806b4742606b0af22d6b07058e8a78c6672618 WHIRLPOOL a79f7e522e645b605eabb155c604cf6e2e435e9325551a22efbe5c1b12f57726c8ccdad510ef618cc510b409acc6cb86204630ecb4cf1af6d1adc628bb19dd33
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-0.7.ebuild b/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.6.0.ebuild
similarity index 50%
rename from dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-0.7.ebuild
rename to dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.6.0.ebuild
index 0267b5ff2525..3eb214d1d49a 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-0.7.ebuild
+++ b/dev-ml/angstrom-lwt-unix/angstrom-lwt-unix-0.6.0.ebuild
@@ -5,24 +5,34 @@ EAPI=6
 
 inherit findlib
 
-DESCRIPTION="Convert OCaml parsetrees between different major versions"
-HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
-SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-lang/ocaml:=
-	dev-ml/result:=
+	dev-ml/angstrom:=
+	dev-ml/lwt:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	dev-ml/jbuilder
 	dev-ml/opam"
 
+S="${WORKDIR}/angstrom-${PV}"
+
+src_compile() {
+	jbuilder build -p ${PN} || die
+}
+
+src_test() {
+	jbuilder runtest -p ${PN}
+}
+
 src_install() {
 	opam-installer -i \
 		--prefix="${ED}/usr" \
diff --git a/dev-ml/angstrom-lwt-unix/metadata.xml b/dev-ml/angstrom-lwt-unix/metadata.xml
new file mode 100644
index 000000000000..6a85d809eb32
--- /dev/null
+++ b/dev-ml/angstrom-lwt-unix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+  <upstream>
+	  <remote-id type="github">inhabitedtype/angstrom</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/angstrom-unix/Manifest b/dev-ml/angstrom-unix/Manifest
new file mode 100644
index 000000000000..693923160ef2
--- /dev/null
+++ b/dev-ml/angstrom-unix/Manifest
@@ -0,0 +1 @@
+DIST angstrom-0.6.0.tar.gz 80393 SHA256 9080c6ad32ee5c31ae5b754370328daa5febb219ae2a1e8390fb469622dca7ee SHA512 4b03022f3e8147075653a9740473ce23fc42ba8c559f1b86311132fa1a09cfac0f044cb3a8c9fc2d97f4acef35806b4742606b0af22d6b07058e8a78c6672618 WHIRLPOOL a79f7e522e645b605eabb155c604cf6e2e435e9325551a22efbe5c1b12f57726c8ccdad510ef618cc510b409acc6cb86204630ecb4cf1af6d1adc628bb19dd33
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.ebuild b/dev-ml/angstrom-unix/angstrom-unix-0.6.0.ebuild
similarity index 51%
rename from dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.ebuild
rename to dev-ml/angstrom-unix/angstrom-unix-0.6.0.ebuild
index 0267b5ff2525..dafa4f13989e 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.ebuild
+++ b/dev-ml/angstrom-unix/angstrom-unix-0.6.0.ebuild
@@ -5,24 +5,33 @@ EAPI=6
 
 inherit findlib
 
-DESCRIPTION="Convert OCaml parsetrees between different major versions"
-HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
-SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> angstrom-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-lang/ocaml:=
-	dev-ml/result:=
+	dev-ml/angstrom:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	dev-ml/jbuilder
 	dev-ml/opam"
 
+S="${WORKDIR}/angstrom-${PV}"
+
+src_compile() {
+	jbuilder build -p ${PN} || die
+}
+
+src_test() {
+	jbuilder runtest -p ${PN}
+}
+
 src_install() {
 	opam-installer -i \
 		--prefix="${ED}/usr" \
diff --git a/dev-ml/angstrom-unix/metadata.xml b/dev-ml/angstrom-unix/metadata.xml
new file mode 100644
index 000000000000..6a85d809eb32
--- /dev/null
+++ b/dev-ml/angstrom-unix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+  <upstream>
+	  <remote-id type="github">inhabitedtype/angstrom</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/angstrom/Manifest b/dev-ml/angstrom/Manifest
index b5a1799d0854..ad924f8a4c88 100644
--- a/dev-ml/angstrom/Manifest
+++ b/dev-ml/angstrom/Manifest
@@ -1 +1,2 @@
 DIST angstrom-0.5.1.tar.gz 131214 SHA256 f9ae1834f5d89469b37c0f7a1a9c21a71c1085703ad34570791dbe7522889492 SHA512 e79c11333b11e2fb25f7a6667f9c6498a55ead7d9517c9b0e0b4e9cab1a220e65017a105e146f82688c54a6abf0f7a269ed163460f8fa83f95bec6bec61b8d5f WHIRLPOOL dd7382046338d615409d0af216db482072719580f5a96b6c6dd16b85d03dd125af834433fd4f3ef6de008319764aa76b2575edd698e9313ead931304cd45fdd0
+DIST angstrom-0.6.0.tar.gz 80393 SHA256 9080c6ad32ee5c31ae5b754370328daa5febb219ae2a1e8390fb469622dca7ee SHA512 4b03022f3e8147075653a9740473ce23fc42ba8c559f1b86311132fa1a09cfac0f044cb3a8c9fc2d97f4acef35806b4742606b0af22d6b07058e8a78c6672618 WHIRLPOOL a79f7e522e645b605eabb155c604cf6e2e435e9325551a22efbe5c1b12f57726c8ccdad510ef618cc510b409acc6cb86204630ecb4cf1af6d1adc628bb19dd33
diff --git a/dev-ml/angstrom/angstrom-0.6.0.ebuild b/dev-ml/angstrom/angstrom-0.6.0.ebuild
new file mode 100644
index 000000000000..a339e74dacc6
--- /dev/null
+++ b/dev-ml/angstrom/angstrom-0.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Parser combinators built for speed and memory efficiency"
+HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/ocaml-cstruct:=
+	dev-ml/ocplib-endian:=
+	dev-ml/result:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/jbuilder
+	dev-ml/opam
+	test? ( dev-ml/alcotest )"
+
+# needs old alcotest...
+RESTRICT="test"
+
+src_compile() {
+	jbuilder build -p ${PN} || die
+}
+
+src_test() {
+	jbuilder runtest -p ${PN}
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		--mandir="${ED}/usr/share/man" \
+		${PN}.install || die
+}
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta10.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta10.ebuild
index 338fa4fbe390..22e29d5d8751 100644
--- a/dev-ml/jbuilder/jbuilder-1.0_beta10.ebuild
+++ b/dev-ml/jbuilder/jbuilder-1.0_beta10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/jbuilder/archive/${MY_PV}.tar.gz -> ${MY_
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
 IUSE="test"
 
 DEPEND="dev-lang/ocaml:="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild
new file mode 100644
index 000000000000..052fa649710d
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_50"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="test ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,}]
+	!sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	! use test \
+		|| has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Python is needed to run tests using lit
+	python_setup
+
+	# User patches
+	eapply_user
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DWITH_POLLY=OFF
+		-DLLVM_ENABLE_ASSERTIONS=OFF
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	cmake-utils_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/lwt/lwt-3.1.0.ebuild b/dev-ml/lwt/lwt-3.1.0.ebuild
index e3b39149b6f0..54deff235c7a 100644
--- a/dev-ml/lwt/lwt-3.1.0.ebuild
+++ b/dev-ml/lwt/lwt-3.1.0.ebuild
@@ -27,7 +27,7 @@ DEPEND="${DEPEND}
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm64 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86-fbsd"
 
 src_configure() {
 	ocaml src/util/configure.ml \
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index a1f914fa1032..f1b1a169af01 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,5 +1 @@
-DIST menhir-20170101.tar.gz 738131 SHA256 99696f365511e0440c18d295b7073a13886c5b594e1875f5967ad897a2216a46 SHA512 810d9863873519b9052464e522894579ffd2f9685851ba32c34cf772570710e7dde2a4629ab6407c2404d2587132488aeebed97db2dad1a456e28104c230bbac WHIRLPOOL 427cb187e5b57f51fe57df519f1732a4f827d0090705e70feecfe62f06e94a95d5e8c5e4b7b9e31f1c199f7c7f7dcfd6f48a3d29d0c8f66548761d85f1c64514
-DIST menhir-20170418.tar.gz 1128319 SHA256 31deadeef2129ffcbdd78717007e13f87031432e6c3601f7e829bb0e5f9c7d2b SHA512 b261a0014c4b5c79d8e439c708d59f3448a6f7a7a0f5390ac319793bdb3d4a2d3774dd9e8e8151fb8208a597aec86422f24d48a2f1809751e3d12d13e14620b5 WHIRLPOOL 7b0f299c4494a54d137e8433c4f8b7440469f55501793ea403a6f1a4ef3a174c4e14f11ce5ca3d2938b44f683f7424879947c1aa9b8a7053a0727f423f236771
-DIST menhir-20170509.tar.gz 1128580 SHA256 36a690856f972adaadcff0138380b563f92041aab9d5dcaf29da1c27c8326baa SHA512 51d7a9f83dc8b31c3745c4eb86d5b6d952e54a4468e23aab7f413c316e40472612fe6ddb9503231ca93b14f6097e9624d7cd581d6ca5d7067fe3e98d0a3c10e1 WHIRLPOOL 159739872eecb85045eaae7bd7aaea4c8dfc914da5d46187d06d7aa44638e6a3d6d355b30265743a64eac07b58831df66eb5e8f7e73f1ccb76b89722e38c9d86
-DIST menhir-20170607.tar.gz 796429 SHA256 00caa66ed0d1544defda24539f2ca1d37b92120e0575aafc5fcabd8e5364ce61 SHA512 468e0b042b8deabe2db4c33d59ff0a5d9177845bfc31eeffb4ba90de6a5e52cf2cd98965c8ec0cf6f849f459738f59802564d76310fb06f0aa4746c1441eade1 WHIRLPOOL 175f10b4b1c3bf78f4dd82095e44b972c85f603701a143c34dde605b7a3ec1ef46f90d042b5f17374b25d26cc625249f098a7328960be4f621eebdad715bbb5f
 DIST menhir-20170712.tar.gz 855262 SHA256 ca482d690052343d6cb9452433248a0a92cc8bfc8fa529dc313220c9d7c0d000 SHA512 7850fa031a2bd69e9cf17db6d8f82f716ab5f9e60b34d1a53591a3ff46750fb01880f3282a7194465441abc4c2ba60f543646097f5f0eef6fe78b36266a3dbdc WHIRLPOOL 0c7cfcc798c2126ca345b38560972dfca79adf2b5bf2fa0d4dccaf1745298dec601c902cae8f9b35970e63084d0a261cd42f230b1c452905a28607d18fcebeed
diff --git a/dev-ml/menhir/menhir-20170101.ebuild b/dev-ml/menhir/menhir-20170101.ebuild
deleted file mode 100644
index ad587a96ffe2..000000000000
--- a/dev-ml/menhir/menhir-20170101.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc AUTHORS CHANGES
-}
diff --git a/dev-ml/menhir/menhir-20170418.ebuild b/dev-ml/menhir/menhir-20170418.ebuild
deleted file mode 100644
index 66e656a02426..000000000000
--- a/dev-ml/menhir/menhir-20170418.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/menhir/menhir-20170509.ebuild b/dev-ml/menhir/menhir-20170509.ebuild
deleted file mode 100644
index 66e656a02426..000000000000
--- a/dev-ml/menhir/menhir-20170509.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/menhir/menhir-20170607.ebuild b/dev-ml/menhir/menhir-20170607.ebuild
deleted file mode 100644
index 5dfe716cd992..000000000000
--- a/dev-ml/menhir/menhir-20170607.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="LR(1) parser generator for the OCaml language"
-HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
-SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="examples +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	if ! use ocamlopt ; then
-		export TARGET=byte
-	fi
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}"/usr -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
-	use examples && docompress -x /usr/share/doc/${PF}/demos
-	dodoc README.md CHANGES.md
-}
diff --git a/dev-ml/menhir/menhir-20170712.ebuild b/dev-ml/menhir/menhir-20170712.ebuild
index 5dfe716cd992..51e7184f445c 100644
--- a/dev-ml/menhir/menhir-20170712.ebuild
+++ b/dev-ml/menhir/menhir-20170712.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="examples +ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index bd1f69e1d751..32755ad4ffca 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -1,3 +1 @@
-DIST ocaml-migrate-parsetree-0.7.tar.gz 168579 SHA256 a9048e1a9c004ec9b307452fff25e8f31853942e42d054bd052739eb838026a2 SHA512 d43a80823496670877a01a0d3b9edc0960e80e84562470723b7188922c880262268f518e8fa3dbbcccc0176fba84cc8c1a18baac8ececb13303ed402cf0bff9f WHIRLPOOL 788fc318bcc972a1b62b951ab1e4a2315e3c4922b07c74cb910716f1e41bb61babe0acf86a0fbd15d8e05a2ff7da05a683b8005119f4a65d284ea0a453098e0e
 DIST ocaml-migrate-parsetree-1.0.1.tar.gz 206070 SHA256 8655a95abcd1ef9e05219db19fb0f1eb79cf502276c9e8d007446575c3cbdf7f SHA512 de9992e4e8e9bbda6fcaeaab794f88f695ea69ed63ab083fb1746db53127a80d7dcc19b843c7dc9e2fa01132eacf89b000639c76c89d1010a6c4f6508af73a52 WHIRLPOOL ec9833768ec35d9d9838e47c35f34e680c0ce0e326d6b3cfe62f3016b96e8f031fcb84ddc5f5fe805dfe0dff5c82968ac44a2240c7133aeb1d3497d201ce1e22
-DIST ocaml-migrate-parsetree-1.0.tar.gz 169706 SHA256 c6cfd5012d357cfbeb059d3286e9dcc003bebe98fa3901a21389b1dbb0446741 SHA512 24930b2368cfd86a489cddbe391b978a8f4c34ba7aa2dd3ce849f4fe8d836b5eaefab18a782df93ead641094f19261941754802ae1019ed7c0c8a8c1dcdecb15 WHIRLPOOL 7d314d7fd8a82ecb4dda12c12e7f5134680c351a9996b4e00226a8fc3c3ba6457afc16a3d869910a24c271561c9e6dda355fe8bb82a936f0072e6b05dcc7b9d0
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild
index ed8ba40638d9..4c7db9b3f7a6 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/${PV}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_tools_versioned/Manifest b/dev-ml/ppx_tools_versioned/Manifest
index 8eaf82896b61..065a9cc70d06 100644
--- a/dev-ml/ppx_tools_versioned/Manifest
+++ b/dev-ml/ppx_tools_versioned/Manifest
@@ -1,2 +1 @@
 DIST ppx_tools_versioned-5.0.1.tar.gz 43741 SHA256 3989a789be7b3255acc013efa9084596ff980d527bf2860c73d08ab4620b1b8e SHA512 4d47f82c5a05f880dbb3d10caac6de705b9609c488d62be84eb1ebe22fa8c4e3716fad7c546035e955bd0e304d7940f23df090470f86c8d862b549b9db387acb WHIRLPOOL 004f54fb967f337906df0fce5fbd20cea2a77fa9bac31d435623f393f16711a56a956523e790578a5b44f906ab1f4d204bc2373a7f4388e1e9dbe81e15a2843a
-DIST ppx_tools_versioned-5.0beta1.tar.gz 43709 SHA256 c558f9f946c9237511ed7b755868acfb6eb5ee6196da0e1c8361c2adb8d8bc9f SHA512 e536a41126d28addf54752ccb851a5dfa2e8ecf16770a1ae891820bb0a8606eb72660f56349fec9f41d208103096e4e5c3d9834edf255ba2349b09aaaf9aacf2 WHIRLPOOL fbf74737a18ac6d0eecadc38849d902dada5121fe55ee1a55fbc435f1c6f69b3c1f2b87b729623ef971a960979dca367f295cb10d19c9125efb758b8055fae7b
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
index 9bc165ce4a05..96eef40e368c 100644
--- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
+++ b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0_beta1.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0_beta1.ebuild
deleted file mode 100644
index 9bc165ce4a05..000000000000
--- a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0_beta1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit findlib
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/let-def/ppx_tools_versioned"
-SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-lang/ocaml:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.23.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild
similarity index 91%
rename from dev-php/PHPMailer/PHPMailer-5.2.23.ebuild
rename to dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild
index 8b5977bf1cf7..e5e14253a059 100644
--- a/dev-php/PHPMailer/PHPMailer-5.2.23.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-5.2.23-r1.ebuild
@@ -16,6 +16,13 @@ RDEPEND="dev-lang/php:*"
 DEPEND="${RDEPEND}
 	doc? ( dev-php/phpDocumentor )"
 
+src_prepare() {
+	default
+
+	# Bug 626060 (CVE-2017-11503) temporary workaround.
+	rm examples/code_generator.phps || die
+}
+
 src_compile(){
 	if use doc; then
 		phpdoc --filename="class.*.php" \
diff --git a/dev-python/clang-python/clang-python-4.0.0.ebuild b/dev-python/clang-python/clang-python-4.0.0.ebuild
index dc7e4ee8aaab..c77ee951ec2f 100644
--- a/dev-python/clang-python/clang-python-4.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-4.0.0.ebuild
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/cfe-${PV/_/}.src/bindings/python
 
 src_test() {
-	python_foreach_impl nosetests -v
+	python_foreach_impl nosetests -v || die
 }
 
 src_install() {
diff --git a/dev-python/clang-python/clang-python-4.0.1.ebuild b/dev-python/clang-python/clang-python-4.0.1.ebuild
index dc7e4ee8aaab..c77ee951ec2f 100644
--- a/dev-python/clang-python/clang-python-4.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-4.0.1.ebuild
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/cfe-${PV/_/}.src/bindings/python
 
 src_test() {
-	python_foreach_impl nosetests -v
+	python_foreach_impl nosetests -v || die
 }
 
 src_install() {
diff --git a/dev-python/clang-python/clang-python-5.0.9999.ebuild b/dev-python/clang-python/clang-python-5.0.9999.ebuild
new file mode 100644
index 000000000000..c892681f3410
--- /dev/null
+++ b/dev-python/clang-python/clang-python-5.0.9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit git-r3 python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${P}/bindings/python
+
+src_test() {
+	python_foreach_impl nosetests -v || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index be306e0a887a..6019ef499996 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}/bindings/python
 
 src_test() {
-	python_foreach_impl nosetests -v
+	python_foreach_impl nosetests -v || die
 }
 
 src_install() {
diff --git a/dev-python/jpype/files/jpype-gcc6-noexcept.patch b/dev-python/jpype/files/jpype-gcc6-noexcept.patch
new file mode 100644
index 000000000000..710844d35608
--- /dev/null
+++ b/dev-python/jpype/files/jpype-gcc6-noexcept.patch
@@ -0,0 +1,57 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=608920
+Upstream commit: https://github.com/originell/jpype/commit/3a4fb98938afd9c03070086d1b8fda8841410fa3
+
+From c3578c3488de35236f73b6eb27428b1f1526c45b Mon Sep 17 00:00:00 2001
+From: Peter-Levine <plevine457@gmail.com>
+Date: Sat, 11 Feb 2017 23:31:27 -0500
+Subject: [PATCH] Mark destructor that throws as noexcept(false) for >=C++11
+
+---
+ native/common/include/jp_field.h | 2 +-
+ native/common/include/jpype.h    | 6 ++++++
+ native/common/jp_field.cpp       | 2 +-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/native/common/include/jp_field.h b/native/common/include/jp_field.h
+index d28b795..f93752c 100644
+--- a/native/common/include/jp_field.h
++++ b/native/common/include/jp_field.h
+@@ -38,7 +38,7 @@ public :
+ 	/**
+ 	 * destructor
+ 	 */
+-	virtual ~JPField();
++	virtual ~JPField() NO_EXCEPT_FALSE;
+ 	
+ public :
+ 	bool isStatic() const;
+diff --git a/native/common/include/jpype.h b/native/common/include/jpype.h
+index 7db5832..a492d06 100644
+--- a/native/common/include/jpype.h
++++ b/native/common/include/jpype.h
+@@ -64,6 +64,12 @@
+     #define PyUnicode_FromFormat PyString_FromFormat
+ #endif
+ 
++// Define this and use to allow destructors to throw in C++11 or later
++#if __cplusplus >= 201103L
++#define NO_EXCEPT_FALSE noexcept(false)
++#else
++#define NO_EXCEPT_FALSE
++#endif
+ 
+ #include <map>
+ #include <string>
+diff --git a/native/common/jp_field.cpp b/native/common/jp_field.cpp
+index 8c75e58..5ef9d8c 100644
+--- a/native/common/jp_field.cpp
++++ b/native/common/jp_field.cpp
+@@ -63,7 +63,7 @@ JPField::JPField(const JPField& fld)
+ 	TRACE_OUT;
+ }
+ 
+-JPField::~JPField()
++JPField::~JPField() NO_EXCEPT_FALSE
+ {
+ 	TRACE_IN("JPField::~JPField");
+ 	JPEnv::getJava()->DeleteGlobalRef(m_Field);
diff --git a/dev-python/jpype/jpype-0.6.1.ebuild b/dev-python/jpype/jpype-0.6.1.ebuild
index 6ab0fe495434..090ec143ecb2 100644
--- a/dev-python/jpype/jpype-0.6.1.ebuild
+++ b/dev-python/jpype/jpype-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,6 +22,8 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=virtual/jdk-1.6"
 
+PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
+
 python_compile() {
 	if ! python_is_python3; then
 		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
diff --git a/dev-python/jpype/jpype-0.6.2.ebuild b/dev-python/jpype/jpype-0.6.2.ebuild
index 3ea7f1fefbc3..f8dfefc0dd22 100644
--- a/dev-python/jpype/jpype-0.6.2.ebuild
+++ b/dev-python/jpype/jpype-0.6.2.ebuild
@@ -22,6 +22,8 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=virtual/jdk-1.6"
 
+PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
+
 python_compile() {
 	if ! python_is_python3; then
 		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild
index c772985eeeec..c83c413ca605 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
+IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
 DEPEND="
@@ -77,6 +77,5 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/lit/lit-5.0.9999.ebuild b/dev-python/lit/lit-5.0.9999.ebuild
new file mode 100644
index 000000000000..61b9ce3ec021
--- /dev/null
+++ b/dev-python/lit/lit-5.0.9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+S=${WORKDIR}/${P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	./lit.py -sv tests || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.2.ebuild b/dev-ruby/actionmailer/actionmailer-5.1.2.ebuild
index 968ae515cccf..544ebf1639f8 100644
--- a/dev-ruby/actionmailer/actionmailer-5.1.2.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-5.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/actionpack-5.1.2.ebuild b/dev-ruby/actionpack/actionpack-5.1.2.ebuild
index 41fe2765253e..cbe3029d7652 100644
--- a/dev-ruby/actionpack/actionpack-5.1.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-5.1.2.ebuild b/dev-ruby/actionview/actionview-5.1.2.ebuild
index 4c0ab24125c1..b1a5593fad48 100644
--- a/dev-ruby/actionview/actionview-5.1.2.ebuild
+++ b/dev-ruby/actionview/actionview-5.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-5.1.2.ebuild b/dev-ruby/activemodel/activemodel-5.1.2.ebuild
index 577803789c95..cf872504ad72 100644
--- a/dev-ruby/activemodel/activemodel-5.1.2.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/activerecord-5.1.2.ebuild b/dev-ruby/activerecord/activerecord-5.1.2.ebuild
index 9ae2715b10dc..2a8c65398879 100644
--- a/dev-ruby/activerecord/activerecord-5.1.2.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.1.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index b0fb3f987835..64dbd944e34d 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,2 +1,3 @@
 DIST asciidoctor-1.5.5.tar.gz 543437 SHA256 2da103a6b108ba31fced25c79d52318f41f349a8552917a11e910d194f95190b SHA512 6a95c2e48314a1f44d6398d83c490231baeb4ebea8d8c0e0ef361c884251fe054d48afceccadfb6c34947946920731e0194fc3e398b8dd8b8b320ea9d37f1f66 WHIRLPOOL 1772b12098b117200b36c5bf3fe9659b178ced7c9994fcc1332bc89c4b3dde1824feae70e3b9178569283c69c0345e37ac4394877feac4aa0ae32c103b91359e
+DIST asciidoctor-1.5.6.1.tar.gz 528614 SHA256 27e238f4cc48c19e1060ec8770a1c6eb55c3b837d9063aa99bc37e38d76b4a48 SHA512 ed700f8ae7ca04700cb1814f819c0f29098266e0b457edb0ade413ae231388f7d217f929e6dff26daaafd6ad8d4c2f1de5debb49cd841fc493aa9d94a9069549 WHIRLPOOL de559dc0199ab66c142cb389765323be411d5841b2c8ee47af0b0bc3e2e16b6b222dd5cb3a2be4698d75de931afaabdf692ac06caae951f35c85c6fb3b574d79
 DIST asciidoctor-1.5.6.tar.gz 527048 SHA256 ceaadf42fd0b649b7090070d359fed071e9d190fc060532c9a7e442a6297e269 SHA512 a9ceb4d75173141d0997bd64b06a7fddfbe79da3dd3c63d9507ef6955c1bec2a1f51fbba06173fb878e22e13ae3945bf7acd7f4fad9b15e8ed689f84bc9f6e46 WHIRLPOOL d28a94ec30383f20cecc44de1274454c3f9f62c6a317916b08365956b25fae6fbc4a114e642cebd976841828fbf2fad7108e9bd46ad9a4abf651cf3f4f9a7ed6
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild
new file mode 100644
index 000000000000..8fd8e5005e3f
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_TEST="test features"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-util/cucumber
+	dev-ruby/rspec-expectations:*
+	dev-ruby/asciimath
+	dev-ruby/coderay
+	dev-ruby/erubis
+	dev-ruby/haml
+	dev-ruby/nokogiri
+	dev-ruby/slim
+	dev-ruby/tilt )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/asciidoctor.1
+}
diff --git a/dev-ruby/capybara/capybara-2.14.4-r1.ebuild b/dev-ruby/capybara/capybara-2.14.4-r1.ebuild
index 13986400ca2c..cb47f0799246 100644
--- a/dev-ruby/capybara/capybara-2.14.4-r1.ebuild
+++ b/dev-ruby/capybara/capybara-2.14.4-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 SLOT="2"
 IUSE="test"
 
diff --git a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild b/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
index 807a65016f9d..d2201d199249 100644
--- a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
+++ b/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/copiousfreetime/launchy"
 LICENSE="ISC"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE=""
 
 # File collision conflict with x11-misc/launchy, bug 545170
diff --git a/dev-ruby/railties/railties-5.1.2.ebuild b/dev-ruby/railties/railties-5.1.2.ebuild
index 50c2b7c38398..2ce9f7c3caa0 100644
--- a/dev-ruby/railties/railties-5.1.2.ebuild
+++ b/dev-ruby/railties/railties-5.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.3.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.3.ebuild
index 946f0d04c4ea..a199ade47e97 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.3.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.3.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
diff --git a/dev-ruby/slim/slim-3.0.8.ebuild b/dev-ruby/slim/slim-3.0.8.ebuild
index dc2a79fab9ae..649bbd25f358 100644
--- a/dev-ruby/slim/slim-3.0.8.ebuild
+++ b/dev-ruby/slim/slim-3.0.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
 
diff --git a/dev-ruby/xpath/xpath-2.1.0.ebuild b/dev-ruby/xpath/xpath-2.1.0.ebuild
index b3e1f65ab14b..61590472fc31 100644
--- a/dev-ruby/xpath/xpath-2.1.0.ebuild
+++ b/dev-ruby/xpath/xpath-2.1.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
 HOMEPAGE="https://github.com/jnicklas/xpath"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index a5dd77fcf8cd..e0b555328af1 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -1,89 +1,166 @@
 DIST advapi32-sys-0.2.0.crate 7217 SHA256 e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a SHA512 8e6bc75fcb2b91d2b8fe281d165aa8281c8ecca9ba09552f5e4cdbadc03b91db5a98789233c4dc858ee9cf8a3488f28af5a742dac50b44f6397fd14478b77618 WHIRLPOOL 30da033ae33a8d6e350bf49e8e525a984d3c18abe7356660f1d2d1e9cbb1dcbae3ac86bfd1469058358889bbeb900fa5dd5be4a6e337005657a82adedc60b1a7
 DIST aho-corasick-0.5.3.crate 252052 SHA256 ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31 WHIRLPOOL 93651414398a02de849aa0b1dd8319678e20df385643422da751e38388afe60ae305f197a68cf2b9d1d6e39ef56c54979b6290a2c82555eb811839acffb72531
+DIST aho-corasick-0.6.3.crate 24963 SHA256 500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699 SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45 WHIRLPOOL e29e10afbf4dfbd1c36fe15af475107116e83c4e85943ca48a1cf90def2556045fd31264b59eb2110ad0d2e8c7ed5fe7594ac92a8fc3328a25c9be90f4173b89
+DIST backtrace-0.3.2.crate 23785 SHA256 72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76 SHA512 74d7d77da8a42e8c2b6cdc7205c41d52c1299a503583ac26dc4f98703f43d2fd4f6e76b34c68dfa0cbc5a0d239ee1bd0144a35fef6274fb4fdf8c732a141e1e8 WHIRLPOOL 3fa9853bbfef6511d6bd1a5a1d1e045f5c85aeadd604be90e58a3a3197922b8bb4aa343593f1d62fc17c65a9b2888188130d315301cb106851732c886bd34765
+DIST backtrace-sys-0.1.11.crate 282665 SHA256 3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff SHA512 56ecfcc927857f1e2d19cea1503a3bff7c5f53c79a5072a514f2137db693585da8d5fdcca94ca0da2a5c8abb0c24184a896f04f4428b7c4830233de9fd98f4e6 WHIRLPOOL 00a5fe73b2e7ab94d9782667d818e6909c20bc750e3786a2e388f269489e48e390a129eb435bc8c3d4d4f0542d6c82ddd5b92c3de2da2d9e9100fac09012136b
 DIST bitflags-0.1.1.crate 8719 SHA256 2a6577517ecd0ee0934f48a7295a89aaef3e6dfafeac404f94c0b3448518ddfe SHA512 aa85c6adda0e9d192f2ae817e3c727167bac8609eb85c8153d99bb42d990de3f931e890924841ca11ba8dbd1413d1c5bf20acd584d182292e8828ed56fcedc18 WHIRLPOOL c93a45bb238b32e551dee23f9023db97eab10c2418a59dd9e3c44ca8cf7c8916de90ffbb5e84b7bff4863ce7a71de54e9fa760967989be906a90bec509a2956a
 DIST bitflags-0.7.0.crate 10851 SHA256 aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0 WHIRLPOOL 60551486cd6688c78ecd0ac40ca39b1f3d75537dd96ec32e9882e205bfe2062de939a129777d66f8c269c8a71e2f2aa240e015c0b3bfa51adbad478024e296d4
+DIST bitflags-0.9.1.crate 12406 SHA256 4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0 WHIRLPOOL 4d6389fcdbd28cfddebc668e1f6fe0b2d34b77ad0b43abf4530179417498b44f8dddfcb0d19dcab84042715e000f9eb9c6f2af169679b74dc6c41dec26f9193b
 DIST bufstream-0.1.2.crate 7477 SHA256 7b48dbe2ff0e98fa2f03377d204a9637d3c9816cd431bfe05a8abbd0ea11d074 SHA512 ddbb8597cd430111e58facfc30e6cf93bce174b09a8f7eeaf7d7062dc856137dbd238a0c7794336d9a2b7d0a1859dc8b8d225116c0c57591106dc6f2e1adc0a9 WHIRLPOOL 7a5bac1c3309d6f5d9dad3a21a7fa146815d2b35444dc356ade49f6f05df2896ee0d88570ac3964939db20633651721e41d7757060b9a5c1b2c5878e68c5adfe
+DIST bufstream-0.1.3.crate 8375 SHA256 f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1 WHIRLPOOL 5e38ae359e5cca3fe223fe85e2cd5357b690eb60f9805ce362a4d3a926ea8aed29da1e0ec90b790cc5a2b749add1ca2524d424652bc6c71a018ce5bf251c7c3f
 DIST cargo-0.15.0.tar.gz 631157 SHA256 6ebe9e0de255d5bd912528bef0f57db7746e162c6d9875a89c6c8b2b40a21d64 SHA512 a5917d500697ffd000204716a1802e83633d0fd1859a918d57b6add932aa7b935f4ca3cd7ac206b1565b0af29414306198500e036fbf4838f4e91920a84e7dfe WHIRLPOOL ab46b5d2141dc83f56c5032386fa5be232711ad2fe8e4c7e7eab4e78d8042ea4bd77ac73cf8c5357da4491d47fca82654108c011bc898e3b0796e4be2a569829
 DIST cargo-0.16.0.tar.gz 628755 SHA256 5f7a7669daea152e84bbf9e6d4ee0ccc6c8e49dd0042f546ba80629bbc0191a4 SHA512 d5763a4e3c5992a457febd663c218d98198849071b173fb7e9f1067c8239aefb32f28827710e3d98f4c2afc3866c62d0bff02044b70a857d9b9540938826eb99 WHIRLPOOL a8b00e1d67f1a7a802afcf096d7548f3a036a6af624a64e2851311fcbe670836ae0c2b9ca89019aa1b3168058c4ef44ac5be724d419a32a51f5bf8fd53a23b17
 DIST cargo-0.17.0.tar.gz 638004 SHA256 fc689ca7a09f1e6a1c31e69f0e2616a93576a68e0e1d7f0ae4c0d3301ff21ff8 SHA512 5ea9a382ab48ee714b5cd1412f11ae72c6065913e2ce56cf84fe43f9061fd383f32c16a6525e5400f3fec9c10eaa3e7a149b026ae9c64af0955e91678b032650 WHIRLPOOL 33b8c75db79356020c3809f23d4a78f656d6c86e0be24affd9b7d0b09e6bf529f8f2606642be665f1eca59ba89438cb8f22009bdfdae2cc0a34ee6d661c79dab
+DIST cargo-0.19.0-i686-unknown-linux-gnu.tar.gz 5068212 SHA256 30ffc32615626b746cbdd2c34d79b3de8ae9889ae56ab33feed9c3a1b9c170fc SHA512 bfe5df682eb566c91995b8c00b5e8edb5d2c3410d1baa5be2ede2e39260b653d34b7723c6c3e8f07d8102ffab50b13e62f9f2d816dad8fba9f39b7bec984181e WHIRLPOOL 3a2c9f36470f611dbd4d8e48c94b401d584b25208abafa1a1073eca33009185e37d92a3f59200027bcfb82bb50acbf5acf4aa87649360afaba7d380bdfcffff0
+DIST cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz 5133993 SHA256 24d5e01b09ba0fb15c4b7ef4f527aca874ce2e0cebc3850fdc2535ac7e25b205 SHA512 6fedb8f83d70dc4fb93a29d400577a5578ceed1448f4e85e8a9509b98b037a125532ebfb6a7e6bc9411501ea74774d2c47ac7e2bcb7ac82baeb925abc46609e8 WHIRLPOOL eb76664d0ac08389beb9feae5f6d603b6846cb3d21f015e97bf702789afa7cedd4cd1fb04594d48af8840dece0bc9c44c74fb84390c5b24dcb5061567b59737f
+DIST cargo-0.20.0.tar.gz 657472 SHA256 f0e21d23cffd3510ba8a65e6a4d1010073afc0e573d9d92c23d22b868ca0bc42 SHA512 b4e31ad2b16d9ca361ceed657112ef4647a872ae8e16052810b6170cd8cc37ecc3c903e7c2d98f914851b2210b35551483ff9e2f0da135aad47e48bbffa4a8eb WHIRLPOOL 0ef1cd0517b8f5eccbfb83427434ad1423791f218c571e355653cadb4c817c0b7bf2a65a0a40691ed7abd8b7025c87fd63dfe93a5eb0009f4675bd6bae9e89cc
 DIST cargo-snapshot-amd64-2016-09-01.tar.gz 4453020 SHA256 365e5cad79512d244b8ced32f8e5b86a710fc6c17f0d0f5f744b8058ef6dc756 SHA512 a87cd21e5be8f7dc580e1d0b78a2ca57b98c8cf09d5d1517a7422448b5e27e6af82ad61d2170b39c2265fd02078ceb9714bd6e79116a30d9cdeefdfe97eceeac WHIRLPOOL 8f7ac8c98a79f59635bcfa3f9872495b0476bb3e9997d09d404169c12cc43f2aa810eeba8b55247abed7cb1c6b4526d9f9ba0f757427f02a15c59e9061b4380d
 DIST cargo-snapshot-x86-2016-09-01.tar.gz 4145052 SHA256 764617ab0a46edfaf5d714488fdb8283edaf9bff96e7132844d14d44c14e69cb SHA512 8f8715c117f7e54101db7dabef12a0a69696a3b173789e4b1c05f578d785ee4f77ecf9f9076d0caf74e1f0effe6c68304280afdd4013e9d8f840b7e090e6c137 WHIRLPOOL de900c1b213e46b28e651d73fb5be13fdf5a28b588ddfdf2ddee3051f94cbe86df1652a7e5a714e76e6d9846fa17094feec6456b27da075d92d7faa1ecb40877
 DIST cargotest-0.1.0.crate 335 SHA256 9f159eae7986fc918c85a308f9389aacaf569d78e0431e777376432d7aa4ddd5 SHA512 d96dfc584dd6c0ed05b609d4fc4375af4950e37d41493113d2693c5180ebb11987c4f7e3fe9e5ccb4b71f37b3afe3bcc646f92ad325ed5fd1df92ac5b095dde8 WHIRLPOOL 21331acc22c77610fded8b48f0e38502f63b7fd7a33daea02d4bd00022ccc59238d5d909ff25fd22a984fb4f7bb39a41abec83244a9f3500c853b3411b714d3a
 DIST cfg-if-0.1.0.crate 2758 SHA256 de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb WHIRLPOOL 8a57a78a8e4a72c3321cf8ac97c2b50f18eb4ed35b2e3c22ca06b5f8031eadccce015237ac846ce78ecf9414632b75a04b168993439d1469eb928d4d05c843e5
 DIST cmake-0.1.18.crate 11546 SHA256 0e5bcf27e097a184c1df4437654ed98df3d7a516e8508a6ba45d8b092bbdf283 SHA512 9bb2ccc80a2ce3d9d437623059e892ea06ab3c46fe4a43735d83fba9b9a03764a619b586cf23392959456860bbf90f498ef563757c13059addb1abbed1a25e3a WHIRLPOOL 2b1920bb0802460f8ab1d8c36aa2351581e40b3699c83ba8bb8411d85f941703fa5436bad83573ab871be9b68c3d40b767743a6ae88112810fab1888a916bd6f
 DIST cmake-0.1.19.crate 11698 SHA256 8ebde6558caa6cf9bffe5750c66c517e7f9d470d59fcd48b0acbc0a02d62a82a SHA512 85c73b5e36e58f75b58a853275e30afce4c12fbaeca9532bd01f90465ad928bcb565b793e7de21154e794c604d5abb99e5b269542e4a1fd6b3724037b49f8520 WHIRLPOOL d972f4e3a9f7c0017e53154c0bed67f6c49d69a2992e7bd469252400dbd062b893896acc71c5bacf854a682a0744d933a52eab243414d006d24f0873797fea91
+DIST cmake-0.1.24.crate 11525 SHA256 b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f SHA512 e8191d4f6b1474cb02fb66d2c32bd6a49c052bb91169a6091623a288f751a7ed595e4b07676c82687fc7fb55850631ff26a50016c56acdc0f74fa31b6a17ab84 WHIRLPOOL ab630d413b7550b9f864071e2fba729586429faee68ad52ac2c5a91b8adedd83c00d0b461601761bf5f0f179eb19a67e5f7f8a5d8390ec422bf110ed4b7540b0
 DIST crates-io-0.4.0.crate 3080 SHA256 e945be5e805781ccbc1134c481b4535ffefbfab9d2073c2121fb2e1cee52664e SHA512 c63740f8b17cb35502c7d9b2845d355851ea559dba0b5321b17987d0a5c9f712d2cd8dc394c5ec998e223b422d4a53aa759556c92fe279a6eb0f5007f7e4346d WHIRLPOOL d0d9d4acd01661746ef558ae452bcde9c98d92690345ca727d5355e780f8b8ff1ef1a46801d930a71f0ae5ff377ecc539ed725b7794b58238651193bacf5b006
 DIST crates-io-0.6.0.crate 3387 SHA256 14982f07738e88d42b575b67b8a902da50473efdcb30b9c43a27e08f399a1943 SHA512 225c0582e2ff28fc7a31a3c5d89f6731cab0593cc9adf2897a1a0f6a8436f58a32d46976241b813ff84de5cbc30e505812b7536df7766dfadfd5f0452626b5c3 WHIRLPOOL 2946deaa0186db87a20064c50c9c870cdf8ef9cf9a358b8fba4b56965f9c252d9b92d2861a54e86ddec00d163bfee0cb7812b92bee4d188181231fcd510365ee
+DIST crates-io-0.9.0.crate 3518 SHA256 341e08bc12f50de704649e7472d39bb55dea3ef1ff65dc4301257ea41a048a5f SHA512 8fc628b073c192568045a7816b9dcc92974f8cc20feb3114283ec890a303211d4529c31643e1827f8c92027ce0a919c5549ad70b55a024464c73672715bcd39f WHIRLPOOL c2394ede37138e10d18bc1440563f533e59a7bc0cbe74907f1e210b2ff0e00bc10890059d7fcf32ebfccd97d9929ef0aae9965f3b68d43b126a48c28db97b020
 DIST crossbeam-0.2.10.crate 32993 SHA256 0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97 SHA512 cdefcda7626c08ca59bdf5581e0e8d3e6367081089cc32dad6e84b5f643c7cbc5b08ce47034dd925fe2f5e2dfcfd18afb51fba511265ee3598fc1844838948f2 WHIRLPOOL 764f0a48c300a587ea56b5f0f7f55d40d8330d0148cd309599b3794d8c28399531b52641a58cd65eb9fb0107ede1a2e7f119c562d4781dee3a8c360b0a5af73e
 DIST curl-0.4.1.crate 53884 SHA256 8fd5a1fdcebdb1a59578c5583e66ffed2d13850eac4f51ff730edf6dd6111eac SHA512 357689f9927b57341324948d4e7f9216f9a21fbbf12b864122509a11565fae4b33498b75b85c0b45566d6b2a432905f140c57889a5e4fd8c154b3fb36e81f284 WHIRLPOOL da72959d9a8aefe5ac1a9b1b2939fa67fbb93fb01a4471efecd3085e8eba61c56018bc5a866d6db3a1f78ef1eb426890cb691dd28bcf5e4212fd68e76fb2f891
+DIST curl-0.4.6.crate 57831 SHA256 c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b SHA512 865b0cae00d0b160bcdc515e7e571b12ccd46189721d26b0642e86cf78af2f321524ef75704213b2e75e301bd5b04e466b422ab28419fb3a74f1ed7715e500fa WHIRLPOOL 704316d160662373e8975bb217464b984640bf3936d0c8cdf279c805707b34017c91cedb1644ea65ca71ba69f78e96aa5957a12127e7e40861f7af1f34a479c9
+DIST curl-sys-0.3.12.crate 2980888 SHA256 f00c8ba847fb0730c293069b4d1203dc01bf3c2e1f90b4e55f426ed8f4a1eeac SHA512 5a861623d0645da868bba3ae60c1a32281ec36914c38ae931b0ebc76f64395e6f80c5fb256cf1fac7e20dec442264a64188b6fd78b23be2ec16f47865171cff7 WHIRLPOOL 2fb011527ad0ebee88c67bfd2750e57dd1eebad87b30adba5a2ae3bb1220c55181f6a2755c0136584e7cf8be531c2aa3e2f39dec2bcca5ff0c06069c21de1499
 DIST curl-sys-0.3.6.crate 3196287 SHA256 218a149208e1f4e5f7e20f1d0ed1e9431a086a6b4333ff95dba82237be9c283a SHA512 10d5308e60be5c08cf4a61cc991648278f832bb9630a3c84fa0f389c53835ed99b74ce89a99ae3ed092685a80f0d50276faea4a42bd2bfb16cc536b6f0b7293f WHIRLPOOL 2a09bb0e2975af780ed37248b46750c7630974e577da4aa9c199a86c02cb1cef8e775a366924a584715029713c15b9bb2f3d3059666c5fe2acf9c83f356ca204
+DIST dbghelp-sys-0.2.0.crate 20721 SHA256 97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850 SHA512 83588245f1df7db15d0c1b0b816e183c75238bcb90776ce42d9be4a9f06c64ab761dc10e2b3da566cf0c392b22acca60c96a8a40f6ef95d4d3f3f570af3f3d0d WHIRLPOOL d7f5f24c7aa5afe267ba8e0fef10a7e53fce1f06b0f8ab803e25d79631f10aa3bf7ad1473fc677db708dc7974927f02b92bfefc6cd7592bc1471a1e487ebd5b9
 DIST docopt-0.6.86.crate 41141 SHA256 4a7ef30445607f6fc8720f0a0a2c7442284b629cf0d049286860fae23e71c4d9 SHA512 f79132ff3d49ad3a4eb37179a8369def367d39110829e673d926d1ba252a63c6f8241e8889895d6cac68af2543de176255a8641e49958746dd729837c54d0da0 WHIRLPOOL df303cfbcbe1ee0e967225cf05250ddf42f5773a89dbc5063a6a4c2e1d36ca5ec003fb39ac85a28669f7da4db3cbc9f648cc2489e203912e817d5905e1462935
+DIST docopt-0.7.0.crate 41313 SHA256 ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8 SHA512 f95549388ee834bdb3bfc2615338990e2e496b1e5059bd92376af5e3a173c365101c5fcc7e82a3aa0ee67ea8362ce98e19df4f02bf65cf14287d61e68299be09 WHIRLPOOL 3e77ec84a9092d0d11e9bdee4103a5f2e88ed1ef50f6c272da2003c51d7eb2700db28122f4a9b4823269190b614184fff40e3b117b5abb7e4a6ca4781173a52d
+DIST dtoa-0.4.1.crate 73264 SHA256 80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda WHIRLPOOL 42a0db475f9a76f944016919e1050196b0237e33fbcb0b5b6c597add90f8052fa1a6b532009e57751ad6145c5d9c2f3798e637ac060fd1891f69366ed1c37414
 DIST env_logger-0.3.5.crate 5950 SHA256 15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181 WHIRLPOOL 21b4c81d96e5a8ccbda8491df42db9144acf41f4a25b1f510d8af7d46c931a28e089615692d46d9eb73c511a9cacfb59a15a5647ed1eea6d17ef9a973d99f5a5
+DIST env_logger-0.4.3.crate 10891 SHA256 3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246 WHIRLPOOL de63679ff8d1f02c57510020a459c8285ccb338f04dfa672a5cddc4718139fd4ddbc931237e81569209fbfa3eeaadc7b6f05649f58ef9018345bbdba2925d39b
+DIST error-chain-0.10.0.crate 18432 SHA256 d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8 SHA512 77552e8db32e2c7d37e01b1050fc889964193d21f281c3ad28c6adf5fcf8d3ee4c73fe182b27282fba4dbc3e6584df7894a3b1fabdee7e219b6d59fcf18a1a3e WHIRLPOOL 658b091222e672fcaeb67c686a8dac21885311c712690e60f7b812ad47e2cede12b5748df440dee3a354da518bfda702ebf6371e06b1bbdc0e57e748f45f7f2c
 DIST error-chain-0.7.2.crate 17208 SHA256 318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f SHA512 7a29d11b57a8c88d8ea347f80f71f9c4ce0b022fcd563f3ced973d6e008f1c0ffcb958bac4108cb02739547a334d6473d7aa20f66feabf06c68f82dab23e1de4 WHIRLPOOL 703381dd5de1ddcc917220b896ebcdfad1664f8371ea5f2103b02b64a32b3d1c594b60b02c1da0011db58fe9c35cb77dcf2323d2f089f3d9bcee5da10ce9460f
 DIST filetime-0.1.10.crate 8884 SHA256 5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922 SHA512 19245d71f60f144828adb6f9336adc5371e559decc8740338122327d28b7c548d011d9e6454b12475f0eb2db7dacdb1e2bfbef01311f59e8338f44d27c3345eb WHIRLPOOL 2af8d65033a9cef609d6688a32953c8ec9ac591ed6c357b62f86a028124d1a0c50199daadf839079771c00b4201971bacecc3928094fd77f9d4c872be8e01c10
 DIST flate2-0.2.14.crate 46692 SHA256 3eeb481e957304178d2e782f2da1257f1434dfecbae883bafb61ada2a9fea3bb SHA512 efe87214a33557ba7f3c255de21f8e556402f947bf7fdff36d4fa98999811bf92efcffdfb53bb1612a8c995673ef423d66906f740875b2213a2fb78306ed0340 WHIRLPOOL f287cd8904600e80337895cf91d705053a9b4a810c199444cdf50b18c45d1fdbb295b31fde7309caf64ed7b91775bfbbcaafdfc026e59f1b11bd82f7c6317d90
+DIST flate2-0.2.19.crate 55174 SHA256 36df0166e856739905cd3d7e0b210fe818592211a008862599845e012d8d304c SHA512 c0e6a011067a7745b8926be752fd7d43284c38571b873efb57dc6fc6f3530f4305069a8e83b92bc0242c72961352687a62fbbe56edcac6517139b19c9585c82f WHIRLPOOL 024273f0389dd2f15db267f821d548521e4426a844282c43ad8f353fc0388458f1c1d5613d9ab4aa0e69554d435b0539474f3c071e4f85aec6f3ff1bc2f68f6b
+DIST foreign-types-0.2.0.crate 7182 SHA256 3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d SHA512 aedde435a898d65473dfeaf27eb469bb76ed9cea808b3e7a9eef3087ade49e3e39a3997a515882262901988a0ff17a68c9486a635da9829eb0fbf5a708260fe1 WHIRLPOOL c7ba139fb3e9d764b3595a5b510305c724bec84b9fa965400f984ba75472aa175dbdb5d21b6a087a1a30064f2e453c3801a9dfa86d6752ac7824afc8a11a9583
 DIST fs2-0.3.0.crate 11874 SHA256 640001e1bd865c7c32806292822445af576a6866175b5225aa2087ca5e3de551 SHA512 00423172c7bfceae2c6e769c414d460d61a763d533073cbffcaac60979493b00d19dff3b8191c4ef97c87a4f860dd11fb4f0aafd730a6a3655665a9f1d83c0d8 WHIRLPOOL e29563d93b92aa2b0bd584c8f2bb1f482d6d942434b129ad79f777692776ac907e475f6ecf805e5f23ffacd7c58ca8f7861a2553fc92b53ecd177b8a174843d7
+DIST fs2-0.4.1.crate 12039 SHA256 34edaee07555859dc13ca387e6ae05686bb4d0364c95d649b6dab959511f4baf SHA512 2c27424c716fa69a0d53784285683d8d87a26abe2875bfb9135502622ec4656ac6ebfe508a24b413444aa5c0077c2a022dfdb3d19bf4836d8dd9d006af5c418d WHIRLPOOL 3fb3f541e6fe6e642753f1c777eb20deef24b8f44a613bb6e77560411808c61a49c0e11bc67a3eafca43d07d45dc4766100c61a49860bfdb1a527255a84f9ca5
 DIST gcc-0.3.38.crate 24427 SHA256 553f11439bdefe755bf366b264820f1da70f3aaf3924e594b886beb9c831bcf5 SHA512 cca8e2ff6acb8bdd87017808d2ebd70db5c13a2a6cbcb8d251c8fdb8b92a0ae1738ed6ae4d0879e264aab7ea7aa7874ea4e21c7230e2d859a3f72c6200ef2025 WHIRLPOOL 743929277e67b75e50be9e31e7ebe1043dbe86bdaf6a1636bae9ac0cd4632020399f4b325dc1d349aa90994ae8a76edfb373bd80633fcbf8ea70d4c4e5967f48
 DIST gcc-0.3.39.crate 24744 SHA256 771e4a97ff6f237cf0f7d5f5102f6e28bb9743814b6198d684da5c58b76c11e0 SHA512 7e253d1e1cf4b86b3ddb463975411473525ba3d8f2417b68fef07fe686c08452657a432aaab1ee05b37d73273544b3e3f97c41fdc1c2c2c505766554e04327f0 WHIRLPOOL 71a07a816a699e087753c199543d344cf6e7e54340c78f7baf926a9efff35b30d8de477a50140bb9fe26018229fce9f73fba201360b091d0b3c72e67d54a1c94
+DIST gcc-0.3.50.crate 33085 SHA256 5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6 SHA512 d4e15365812336fe263108d3b24206d4de14c350ca2fae620d232d352a2876905468c3adc6829e9a517a6689398d45ef96ffc0fcb846c8d76976f77194a39222 WHIRLPOOL 1f595463778e3eca21ce4ef51cc56df100b7e23db48c2554979434f4bd5adbee5b9ff9cb1ca71d78c3e66e287430227e4db7b46d44a632c120a3a825b5e0897d
 DIST gdi32-sys-0.2.0.crate 7643 SHA256 0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518 SHA512 009f51899ecf9c8a6c688c3b087c294482c9d4c09b9c2b7fd5d949ed269bed9dea7ab5ff95ba9524c3402e4299d944205187f99ce0d0300a1646ff021030f19c WHIRLPOOL f7a8005023ee0cf45af76580acb0960680694a3481c8ee2a6d78278f438fe35a245672854720984c7a1c6b81152bd1f705a78f4c554aced34ad81f882c0305b6
 DIST git2-0.6.3.crate 126947 SHA256 0534ca86640c6a3a0687cc6bee9ec4032509a0d112d97e8241fa6b7e075f6119 SHA512 c78bdd853bbeb24d8e730c48f335ca9bb79d7930a83a52cf3d769b4a9feee418d4885aa1da59c966bcfec5e6280a0854235a2042c94ac11d65832d72524cf6a0 WHIRLPOOL 57cb17d1cf6c9ac2e39b7eb719d388aaeeb19860dd8ad346aa020ce126b5156585ee71ada2117af65ff09d711e67b327fb96194198d262a1dd84f88e2d029ada
+DIST git2-0.6.6.crate 131360 SHA256 aa01936ac96555c083c0e8553f672616274408d9d3fc5b8696603fbf63ff43ee SHA512 acba69cab03e2205b5fd5db2620c34cc04d24bc1ac7baed5fb7a1452613a78da1fa42c90c6922436386b5e96650f85b8e628f24754d0aecdc8273f19bbdfb21f WHIRLPOOL c198a75e23c1651968e594da691291447dbb785963ecab4275fdf1ea884c9f6ac5b61a63036dbb8069a05b2564f8465ff7f998c587c7768efe304ac583288ed0
 DIST git2-curl-0.7.0.crate 4097 SHA256 68676bc784bf0bef83278898929bf64a251e87c0340723d0b93fa096c9c5bf8e SHA512 b6adfbe6f75afa1fcbbc0a38f9dd13db87bde6e81eb6403a3f47c4d25a26301677614af82f1c7cb4a4a2122910e0f6450d7555f2bbe9ac97dc1da1243eeeaf0e WHIRLPOOL ee024c845de6171b657d74b69b576279dce07a7402d4c6ea13d49e034ff8f8e388edbd20bea075f06b38a365d3fa377dec58e88b8acdaec35a0feca313ba553f
 DIST glob-0.2.11.crate 18065 SHA256 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e WHIRLPOOL 5f9b80d74ffcda693a008367d73fa0646b1dd73068fcd0075227d15c9bfcc86a05fe8a34163fe9d12806ef10d35f27649459ae05de71abd3a044f99baae041d1
 DIST hamcrest-0.1.1.crate 9217 SHA256 bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4 SHA512 6d6557cec99f482d6a738835d32504252e0a666c1318f6f0ac0f811afa7c087c048960ecd2fad22b403fae9a00b06f742de643a7b5ded1f816c118272232ec2d WHIRLPOOL 463d49d5403692dbe6d604bffdf689069e7998aa21e8658c8478adb9a8c4aa3019e063278694aa8eca98773162f90a1da126b962a487d8bd99f32048fef939b6
 DIST idna-0.1.0.crate 234027 SHA256 1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11 SHA512 a3bdcd7934c8f2823e8be7b467a829334ab53c71e225f2ae73b379db6bf47c8c8fb28d30900eb18c7ce79e9d9780d45babff3d7e77c20640001e6f6ad93b2424 WHIRLPOOL 9bfe69ec718606736b4844a6884872dfb2cf608b3a21494016abbcb44d08400c489a8f51f142b6892501073d3d67b634d6ab593c0282032f5be3ccbbc517db0f
+DIST idna-0.1.2.crate 248301 SHA256 2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37 SHA512 28aeb6fb22f5d2bc47d12d5bfaa24d6c6b070b1dbe66f66a8756bf6cef5f3f21017a4005f507c6b5d86944d54f82d0c7ea2b9aa215a1b758dd420dd648726626 WHIRLPOOL b6a8101bef0bc4ab7a8e44a67c57189fda9ee7515614a7cdd0001f5005dd42e0211aae4d33757aa7b98f021689d361a16ed618e9752476606695660abdeaf1fc
+DIST itoa-0.3.1.crate 73340 SHA256 eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee WHIRLPOOL ee7437deaf3fef0ff242212fdfd3851fadbdab004bc805f902420dbe9a264bd7fa60c41625595283f511c2e069357841dec6a54cb7bdae494fc6f85e760bba98
+DIST jobserver-0.1.6.crate 18407 SHA256 443ae8bc0af6c106e6e8b77e04684faecc1a5ce94e058f4c2b0a037b0ea1b133 SHA512 ef32d6741321b04052ecdfdae1a1267665dda4f275fa6b0d875cda76804a8e704e54a1d9bff478fbd196b5434e651a82b800bf1c9f5c726bfc8ec6d3d7c8ce37 WHIRLPOOL fd8cfb0023092bcec46201a7b8bbdf2ea3beb5f493a3351d08a24710340c833e3c35b9df08bcae9fc163c58f6589a4ccce6c8e7a000c614d28ab830b97a26508
 DIST kernel32-sys-0.2.2.crate 24537 SHA256 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b WHIRLPOOL 036baa6611f13d76692a5c032e7e8e8b5a82e12bdf13d5a2cdcf4d33020b003c941331f0c8aa774e7f7cc7b36ad7403bb2cbdecb739d7645cff66aeecd59b09f
 DIST lazy_static-0.2.2.crate 5026 SHA256 6abe0ee2e758cd6bc8a2cd56726359007748fbf4128da998b65d0b70f881e19b SHA512 d151405da0ff2305cb9556325c783c3214f57f7d905a9de9e41aabfcfa3921a402957b71e48b307feff4c34372e04075864d3eef3b44098df3f8015264eead09 WHIRLPOOL b228bfb5f3a7e65d6d68e6f1c74138c615fcb8c0412c90472db2888fe55bd98b1a8e5c5ba0e77b10f72a351c182743faca943194fc6780f93a0c6d0b4ae54196
+DIST lazy_static-0.2.8.crate 9950 SHA256 3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf SHA512 21c6ea68cb40d187a19e6d960fe0d7e4671101f26b304e4cbe6124f1a3d983fc41c44c4ce9e0d9b984783b7ba94ea873236e48178bdf56cfb8c0a8cfb9ebe368 WHIRLPOOL 8350c49ad994d3404462141310d4050cbdce3ef75cdacd9ab085bf9aaf20e6db5a4dde134273d6ab0ec618275a08acf5c2d154b206d7e3c21d6d8c4fbfad67b7
 DIST libc-0.2.17.crate 108320 SHA256 044d1360593a78f5c8e5e710beccdc24ab71d1f01bc19a29bcacdba22e8475d8 SHA512 fc3a1063ee1c7dac2e4ac00c4fbbf467cd4716f28e68ee897922de0fe0bcf193d44abd0cffa9e52a01b0816549c5156723de6bbbc7e04a05b39c50765ea7d067 WHIRLPOOL a5260b8fe83856019fd99eb47411491b188e63ee7cd3202d6fc7ee8e1a37dcd57205ea03897a35aeb3eae461380dbee574edb18fee427357b1b28cb45a629bf2
 DIST libc-0.2.18.crate 114209 SHA256 a51822fc847e7a8101514d1d44e354ba2ffa7d4c194dcab48870740e327cac70 SHA512 d99e0db6fcc6538ee88109c2857a9e24641326c399f604d9704b9fc9e1d3e79eec8dfb10291499b1900a9a40f0d3d00f50d4709808683032f10fc3bdddebc2bf WHIRLPOOL d1a0129f1c752560f041700a547ba674484c9fef63f55e31001465ce9d3c83ee38e48c04663741dffdd865878ae4ad26b04e6718baf5f22e393e1b888d6907b0
+DIST libc-0.2.23.crate 153939 SHA256 e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e SHA512 34620dc5ea9bb674a74a5b3d14844c098d38980efe4940538f31ab76e29dcfa6b9601a4747da7a8688758052ac416aa8dd693c752a3972a7bd66d9deebff2d72 WHIRLPOOL cc9ecf44eba6403a255285140ffb3fb67cd953550d0848b60c1c155d364afa1c1d6d7ad7768f069cd692fa0178c112ba7572f5db3e06b01ae3d04bc50fcfd3b8
+DIST libgit2-sys-0.6.12.crate 4653762 SHA256 df18a822100352d9863b302faf6f8f25c0e77f0e60feb40e5dbe1238b7f13b1d SHA512 9793177fca3cf89fe64138e3dd7ade894318374a144313a5876ac5766e594d3999ae0bbdcaaa384412a4154e5a4848dd419c888c5ef11a2817a42dbcb4d13d46 WHIRLPOOL caa9ebe3b7e04af230242a09620bd5380625305e0fe4f217c98d4c63279c29159cb74ec7dd8227a87fed80aafe5c18890767c281d8e193d1126c898b630f80b6
 DIST libgit2-sys-0.6.4.crate 4210492 SHA256 b4a72539122e79e54cc5c4d5a7a5b53f03b667f7c22c7a0440433e658cf0440f SHA512 7fdeed9d7070518ac39fd77bad57f5ec2c4ef1043c49d97c679555d36ac50d26ce430fe3fc051cbfb619a4a62908a0b5ab1a52bf8edca1ec96f332621b312e68 WHIRLPOOL bc985279ca77b2e9ba736b320a00dfcfc27486fefd15704d085660b9e64b231ad6e0bba8aecf59a91daf450b9dc9428d8174ddb73c1676cfacbf6210fce319e1
 DIST libgit2-sys-0.6.5.crate 4211865 SHA256 502e50bcdcfa98df366bdd54935bff856f4cf11f725daa608092c0288205887a SHA512 36b5ad0893c1dbf851a4a85dfd8c55eaf8c8267bc387ea2dfdbfd2dee7545e53b8096756b1c89edc95e65cc8c83ab71be8bffa3271b7831eaf398ec744cdb742 WHIRLPOOL 8b0e1ceb5dcd75b7a5d1004567a7a4147b75117b23210b45c7a6540650a779885df8b62c476d21ece4fbcefe486db4f554cf80e597cc45109b113816b2e141d9
 DIST libgit2-sys-0.6.6.crate 4216277 SHA256 c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c SHA512 6cbef4a910a752b9ad4489f45f0d04ae15a68d647f054352896d0aa50513ad1f13bd02902caa814ff8aa2331d9c786aa200ba384ed3239bcee52678d4e928e61 WHIRLPOOL 9397a45aa8313fc213468e252aabd373d5a88c88313d0b777426c502948c52ac3d0739ded4882262adb5f7d075218e7f5f4c7cf60c7cf5cc33ba133dee614f30
 DIST libssh2-sys-0.2.4.crate 410058 SHA256 ed089186abb468a78f7170177304751805e33c20e7aef4b8298884ce2080b5de SHA512 a15a97154b27b8e5896352aacd717eaffcd53931e36bcfe72e4cbbd7d969129bfdcf6ce1176260177e340de7f831dca79afddcbbe62bab66c8bb833860a2bb7a WHIRLPOOL 18f81b928aec345e6fe058c28eb6489c2d9463e5683bfac2eccbc499c9a343213e9fd4943ba84b43f9752dfac45555aedb5c52db9bb28c3cc00963876d2a7ec7
 DIST libssh2-sys-0.2.5.crate 412200 SHA256 91e135645c2e198a39552c8c7686bb5b83b1b99f64831c040a6c2798a1195934 SHA512 31a8861c34acf105678febf41fa4f9418a9f280fe36f5282a079dd4cf379c08339148a655aa26916e0aba00fd906e302ebd94d9920b934ae4dda930a2e23f0ac WHIRLPOOL 2b400855e4e195624d85d7d62c1c12f45a153fc75934f749ea199fcbf07fd51ab0bd111045cdf9049eac77ba2d412ee06de09d82ebd36e28961e4d992d8aea75
+DIST libssh2-sys-0.2.6.crate 412381 SHA256 0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75 SHA512 2a02abf0b29025137d73d4b97a6287142f5677383f22085d3d49f76fd0c8324ef1baf5e9d763b6cc2dd1e339f697b9466341ded5ae2c8cfddf6eeb74e870f8ab WHIRLPOOL 42f96a15d79cb09934db62fa53ca8d41f87f9079631591a0fcc5a39d0280c34fe93498e2c5874db67a056c8fe4cc195276f007c90a663eeeef108eed4d49a640
 DIST libz-sys-1.0.10.crate 602079 SHA256 905c72a0c260bcd89ddca5afa1c46bebd29b52878a3d58c86865ea42402f88e6 SHA512 0c0e61ab153d191a9cd2c7f8f54ae208132d5880285640b909556eae7d0574aca376ffa43f106371583c6a60fc31d1a877657cdaa3ea3d72a9f6818ea87a53c8 WHIRLPOOL f07d6026fdca17771d6f326dc02e367e7c014cccd6a2e30c84c9dc3b4bdfaf0f11bd36930d14312385de20623606aef638f36e482c0ade1e81dfc65626953602
 DIST libz-sys-1.0.13.crate 602795 SHA256 e5ee912a45d686d393d5ac87fac15ba0ba18daae14e8e7543c63ebf7fb7e970c SHA512 13fd5c8be6acb39c47d1596b2aafe6e6ac576345d74b7d121681dcfbe30bcf585bf096ebb4cd62dd0805aea959ef5eaf4fafe72efbd7302810c366d0279fe730 WHIRLPOOL 809eb8e057c67db912159ab5502ebb8b3131ff7861ba7f0015563c38a1622f0981a5975bc9b2808347a080e9a791d8d0d6edaa2b726e4e12f4c2aac2548a5c0d
+DIST libz-sys-1.0.14.crate 603292 SHA256 e70195f655a44af531ad7135b1ec2a0a82522b451fe09730fbb25674a85996e7 SHA512 f62a6fbb52d8af77c7c7aaad910c169c3b0e5e5bcdaea39bf1ef35dd54727ea972db481c75715ad83e123e99fa5d0304f2706ad384b50399616a3a2860485215 WHIRLPOOL ba2072868b123d02a4b96ee831fc8e98a1f6be78391873288b3f878e24fb40f943e27be8d164afc9bfbdfca0a549512496adffd2c25785cf8d2877e3ba24ca15
 DIST log-0.3.6.crate 16110 SHA256 ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054 SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174 WHIRLPOOL 18ef70829fae28a19e545479f4fd6f181d5dbd67ea17dadfa5b8ecdb8437c04f07036de5c2d5421bec4f783ba9b6390e833d624506bdbe99d1b0c47624082bab
+DIST log-0.3.8.crate 17756 SHA256 880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7 WHIRLPOOL ab37737279257682083d3335f1f05d84dea3dbbf624763f739b64da190da64458cc7a3741aa6c35ba4b71e1dad9c3fd1bc7df5334358bba3574faaf3a539688d
 DIST matches-0.1.4.crate 1530 SHA256 efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1 SHA512 a0248296a155fd3132150dcd95d3e51b62cf7b99a8530f0c2ea34455a224613bd7a2d1803fbbe1627aedf826e82e746495df319b62f1189e361c9fa1cd8a380e WHIRLPOOL 06386045c0bc87da223f0590c01225b4b811c9921a3107cbd924fd0caca33d53f5278b7378438c9951f5ba037f533e05ef00a6b056f417d5d0118c4a7174fb42
 DIST memchr-0.1.11.crate 6977 SHA256 d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab WHIRLPOOL af0984d7e8084cc1aef94e486506a0fad9ec81d7be505233343e9fdad2ef0627a4d33bf99c2923959f9604326713ea24a01e2581aaa91249574b6c6d1a6d01a3
+DIST memchr-1.0.1.crate 8221 SHA256 1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6 WHIRLPOOL aefc15c91d981becfdb7132c91f812430759408a6356aeb2ec3064956e55579895c59cd539ebfc4c76cd09bdf4fcaefa888f99e1ae98733e7f11654f5a8cac1e
 DIST metadeps-1.1.1.crate 2767 SHA256 829fffe7ea1d747e23f64be972991bc516b2f1ac2ae4a3b33d8bea150c410151 SHA512 fec3e82e44854b6dc4f4322727f33f2afc5e676c5fee728f299240c3eb40595bed5a46afe75f51fa7f6a32f97e12bfddd04bed92981d7ccaf9d26400b72f0dea WHIRLPOOL 4363326ee702fc1c8af2b3f4a72ee09d06491e1f1d70fc4ae8623d6df66c780660fc093697da9822891f2cc6613305db5f463b158be5f48a264d3cd9051cbb3c
 DIST miniz-sys-0.1.7.crate 53361 SHA256 9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54 SHA512 30fbd5a040cc55642a023ac45915081af5b91c7929e1d5c27f15aec6fbd714886d17b8d41396ab13329f150288fae52a1ec21e41fc3e660fb1a6bd388b38b028 WHIRLPOOL ef69781aa8ccbcce8b5ba8519233a1fcc47b9459b21a9fd1d4e48d5ac58496e5eb382b94b5b671e152531293c74121ae0ceb46ab38dbdca2377a63cf52ebea31
+DIST miniz-sys-0.1.9.crate 53242 SHA256 28eaee17666671fa872e567547e8428e83308ebe5808cdf6a0e28397dbe2c726 SHA512 130d872d25ca30937cbe34d93c6c3be359b4613c192b2dd8c542c0f3c2893c15176afc84da8e9077368647bdc0cc584aa995b3cbc8927b5e7de059b6135be709 WHIRLPOOL f2ec3f08804da08fa60ced1810fbcf6108c9ab54442ca39791d5723cf3c97224ff7927d9258b0347b535086b06972137df2322283960849d99a358b01781000f
 DIST miow-0.1.3.crate 18874 SHA256 d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a SHA512 e1e8be24dc4dc81a52f94d7b779d9ae3950ea5a5f74d1b64ecaa04e556c5f1a8a84058bb3388836369e15c44621f5193003499420cce3098503c47da1b374392 WHIRLPOOL c99dbaa1595a39ce5fcac846f03f30cb311db80719214dd57ead611fe2b680ff58f178219a3b4e1f9b6a43d894793b7bba4a59f0f1c926bdb5a8b5ea66cf2822
+DIST miow-0.2.1.crate 21133 SHA256 8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919 SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72 WHIRLPOOL 447d7d1a69edfe92632ef63124c18764333cdc85795f7779e74d977dd23706e71aaa4c4a57f4b157e90d6f64f1f872bc7e542963bf8f645d6397f26636de9d00
 DIST net2-0.2.26.crate 18489 SHA256 5edf9cb6be97212423aed9413dd4729d62b370b5e1c571750e882cebbbc1e3e2 SHA512 60c6c3b0b9dbfd844c7b52565bf3ed4977394be6396c19aa872d9377bf1961ae3e2cdf87da3822a81d78d453369d740b0477dc48ee62834bd6be4ead6cc92fb7 WHIRLPOOL e0272f280970e9f140fafffaf4883eacfb85d4d371b4f1ff14fd5e668d10b14d051d3b588cbebe9166c327cea2dd0163503ebe4244ba393bd4d0864bbc0ccac9
+DIST net2-0.2.29.crate 19349 SHA256 bc01404e7568680f1259aa5729539f221cb1e6d047a0d9053cab4be8a73b5d67 SHA512 9913b8787a42891f7889484d89f4fe8886c2453d6505cdde68d93884a63fb7172e6354eda2dd7cd3ef8f57612d27d2dd579f2d978af4fee812a3bd941fcd21ae WHIRLPOOL ab2b387f837d91517de3248e863181fbc6e309edb5183eaa73b9c5e9b8986ae5b74479edceb2bab115461f5a5886aa335921cfc278ee8bac8885d70401875245
 DIST num-0.1.36.crate 30018 SHA256 bde7c03b09e7c6a301ee81f6ddf66d7a28ec305699e3d3b056d2fc56470e3120 SHA512 4af505c3a9b8e5343a1c565274da2ee529a418a72f4fddf6bfe2abe57180cc5e261c817f5b9d7a7c23cf73119121c149865d02a1e817cd2e5ce82369f6b4ab96 WHIRLPOOL 497da5b269ba0645c03df3a1138b917695058a39c896fdcd9e3387813f5ee2541c1976af3748abdac6495fe2ba9d6fefeab75894d35978179258c619715dd781
+DIST num-0.1.37.crate 30152 SHA256 98b15ba84e910ea7a1973bccd3df7b31ae282bf9d8bd2897779950c9b8303d40 SHA512 56fab4ca9694d323b947806f4a69af137d30f8cff5ba7a4ddaf35dc97104391ea3a076fdc4b58c9b867db5b38f4f4393e9565ee52cf176c2563db8f15a0e4ee4 WHIRLPOOL 2774e08460d4421aed2db8c344e61d1975311533188daa809bccfbb4043311edfe3baee390c6b01bdf035bbbc2c7d814391dcc5f2dbe6978843e2e1dd2ce114a
 DIST num-bigint-0.1.35.crate 31261 SHA256 88b14378471f7c2adc5262f05b4701ef53e8da376453a8d8fee48e51db745e49 SHA512 41a89872223bae94b7225937d816bde6ff7d46af2d69077b2da79cbfcbf9491a3f58ee8c6218315b67b760baa85d57c1040e3896ca6a3d6caf1014b7c9ff6c09 WHIRLPOOL fdad7aaebf71902d960564ec00eb02d6cd4289d9af43cea3166777b20fae6d4078b0cfc03db92d338d9203ba97f0e6c19974ada8157310a9e59a5e384eafe3b1
+DIST num-bigint-0.1.37.crate 35577 SHA256 ba6d838b16e56da1b6c383d065ff1ec3c7d7797f65a3e8f6ba7092fd87820bac SHA512 eceb339532789a1bad8be6cde079c291754ddb10c9d7d7a1cd84f5cf6394c4452df8bc240a231f51423318b09b43e43b09691aa796da25a45f84f3af90474166 WHIRLPOOL efbe3f29faeabaa5d972d857157c209a4bdc15d5f5f08c67d8d4df27044d94e3006b08bd176543f041a65abd10037836e2182a96ccda5cb9bf4b0f0ef6d3f9fb
 DIST num-complex-0.1.35.crate 8114 SHA256 f0c78e054dd19c3fd03419ade63fa661e9c49bb890ce3beb4eee5b7baf93f92f SHA512 fa6d8de041e4b02813da69ae844389ba422badabfd2396f11716286edf1ba566d3d59e002e7215eb2156d74e1942c2435117054a0d9cac23c00e7285c438aa49 WHIRLPOOL 0c3abf0a916e51757b3053fe4c60a09cd5f3114cc80a76a9e21f808207aa8319cfec1625d82274928deba29c9998c20dc13d2a8875cf822e4bff2a9e6ab59be9
+DIST num-complex-0.1.37.crate 13522 SHA256 148eb324ca772230853418731ffdf13531738b50f89b30692a01fcdcb0a64677 SHA512 0a6deb8eb6555ee12b8432ead66d35b62b7c91bacbf176093b89f8c3c29ea7a3a7231542810a3c82424524f602e20a820d08e17668af073053c02b2d08dd6fb2 WHIRLPOOL 38731ecfd94b7060afd75497cfeae3cbf96c507ca14bf7372bbb2247d7e854c9fc142b3683c5914047e5e1e95d24fdc7fd29547252c9c363cedf420eda83047c
 DIST num-integer-0.1.32.crate 4312 SHA256 fb24d9bfb3f222010df27995441ded1e954f8f69cd35021f6bef02ca9552fb92 SHA512 a1e413aa7881928b848630f2125fc1053a085027b04df7493a33cc711549d84e0ee250f6425b978054c486bf3c532fe04beca191d1729ecccc751b59bdc6ba6b WHIRLPOOL 4c82ae27c0ef1ffba20be79e4e8dc97abc282980d8cae7440d80029029b2d09c4ca6dd8b35c8a2b74935059e13f67f053ef7d7694c4e0203a9e4dc3fc04be052
+DIST num-integer-0.1.34.crate 10400 SHA256 ef1a4bf6f9174aa5783a9b4cc892cacd11aebad6c69ad027a0b65c6ca5f8aa37 SHA512 63a7a46bd424dc2e56462bf826bf72f6ccb62b01786eb78ad901b8fc78aa2b25844f9722327a7c607c311877695e6c79889fb9e862e12f7abbe01cd5f2a3d4d3 WHIRLPOOL 581b38ee19be5dceb3c96d9f568975b0b70b697c78be7de6f5578ab382142fa638a3b6e02dea02c76bcb29d30f11be8c8f981b7dcb953e245804c074901bbdce
 DIST num-iter-0.1.32.crate 2896 SHA256 287a1c9969a847055e1122ec0ea7a5c5d6f72aad97934e131c83d5c08ab4e45c SHA512 ab13228dd619c68c8c2fcf8aababd1b4a9726f126837a83e0e0694a93a3d2cb77620f923d629bc464bdc311084b36ce6248770b965f6a6bc0694a8f6ab6d4cd1 WHIRLPOOL a59cb1f53e7b8f58fa8ec52d5d24b0cb19ae1552051cb60bd2a843d16a70f2d581095f6c9bb7650c24f6107dd177934df54f7a0db5102889b032f2de73bd0b66
+DIST num-iter-0.1.33.crate 7397 SHA256 f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e SHA512 5e27e8539b592dbc370f174d9fd3922902e6ecb47c2324f3a347fd7f4d069d5a9803a2eaa0ee228381b926249df2b3b6ced23d5beb2778fcd47c1ecb96b5c283 WHIRLPOOL b6d0336a575beedd6a853a814bf2db9f874ffdf389c80f7ec8c871d50429a5e94974ea06cc1762d35099aad84aa1f069974c0f5808a684611d2372f9c56646d3
 DIST num-rational-0.1.35.crate 7759 SHA256 54ff603b8334a72fbb27fe66948aac0abaaa40231b3cecd189e76162f6f38aaf SHA512 2bbf05b3ba1a3e98d857ba005cf2aca1f1f2e40961902fea7600cb90ae6e9b5626eb2419f214d4cd07794d6cd5df49a6ba1808fb43f2d3db40089f91a785ddcf WHIRLPOOL f3b75dcc4625b322336986d917b01d0dd811ead255b18f94ff0407fdae6147284b8e0d308b5cd25a80de8b44a0bb736b340dcb7fdced3c5b6a81b8315a843b6d
+DIST num-rational-0.1.36.crate 12556 SHA256 c2dc5ea04020a8f18318ae485c751f8cfa1c0e69dcf465c29ddaaa64a313cc44 SHA512 9325ca6415ca968df0512fabae46910ffbb3b94d61e06ee8392feb525d65654214038624b5df8ff3146cec0ed22a52b9e96bbf54b13aa51aa027df364060cad6 WHIRLPOOL 6e81f73956c9eeb5ca52ab7b1dfd7f57244f721ef95a80053fa5bf3b1b315d5faa12f44561848104e3bbe24e4b3d3f8d51ebd18a20f4e429e47240d3f4ac620b
 DIST num-traits-0.1.36.crate 15071 SHA256 a16a42856a256b39c6d3484f097f6713e14feacd9bfb02290917904fae46c81c SHA512 b1d81ecb12e5894ce0508f0a23f98ad36f321a8571264753087703defcb905d982394c924e21c1da025a43e5bc964ad6d59d605d7c8a2a50addeb89fb93fdebf WHIRLPOOL 964dd256ef028b2ff6e21b70f2bcca2bc60f24854b7a5438f62a9aa69b5e5c0c5bed74f2526939545fb303c7e024911576cc8c3ec37abd923179cab93e64cb51
+DIST num-traits-0.1.37.crate 20492 SHA256 e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99 SHA512 290c7ebc5a0249d9fd937350b854cd5d181dd0ca989a6d9b3d5e05e438343083f40261b4e151f3ce5546e9f9a404cb091b587bb7e1e193fbd26c3317b122c2b5 WHIRLPOOL b6da23ed9dceca1279c069bc1a64fbf426d2fcc79b55912dbbbce70c702644fae70fda09bf0c2fa94a7b35f631298d94178695469b433cb704843f922af04a6e
 DIST num_cpus-1.1.0.crate 6381 SHA256 8890e6084723d57d0df8d2720b0d60c6ee67d6c93e7169630e4371e88765dcad SHA512 31999bdbda7e1ca02a4a276a47f4b61e56dbb8987747de7b6850d5c9f21e0b8c541b5fa9fd07203c8790e6bcc6ffcf9167270dd2fc9716396b8d3cb2b88bebf1 WHIRLPOOL 3006f0b30a90218aacaf9004ab68dd306ceec22caa1ab5ccb01fa9a4b1a9ef998da3bddd3514466d8d5529a74a2870a9190415460f390987694253acc93f1d0c
+DIST num_cpus-1.5.0.crate 7684 SHA256 f6e850c7f35c3de263e6094e819f6b4b9c09190ff4438fc6dec1aef1568547bc SHA512 c782859acfeb26e9a335920799a071e9ede34355fd0ae39e708fcc96372da09c3d144267e92f0ff76fb079b0dfb0bce184b9b44fdaa61a15d8916b879376c3c9 WHIRLPOOL 808a4220091b49dd6eb88628116e8cbc35d9d4d88119aeecc1a8c2f7dad872baec5817bef466243af595affafe5a0421ecedecdf70c6a2983986fb7d22f1909f
 DIST openssl-0.9.1.crate 80149 SHA256 1eb2a714828f5528e4a24a07c296539216f412364844d61fe1161f94558455d4 SHA512 8f3fa912e16b203f8dea3815bcf72ad80645dc7ec69c74cb0aa5ef30a69b14577fe292a1fe7d7aca5163098bf4789deae7cf99c4bea3b3f48cf7e5513f3b63aa WHIRLPOOL 5d06da635f9a720055f62191e84aac48a57160d43c39a43b31c2afb47b16b84c05adceb0d5a48ebe9118122d117a8419c6828c3568a38e6c8db4dec118f454a5
+DIST openssl-0.9.13.crate 124078 SHA256 b34cd77cf91301fff3123fbd46b065c3b728b17a392835de34c397315dce5586 SHA512 1c61564c238a2a62e9a5cf567deb088feb5c9c595f348fe3ba1a419b69bcdbff6632c3544d49f805ae69a98cc64dd0ac240a24f22cd2da3560868929837b4984 WHIRLPOOL 340cccce8b64f281e0a04d650ddfb73de122aa8dd39bd56900e57b3de9d6abaa641deba24015980a04082c45b5e6cd38b72628374b41f8e048ec42a1413012dd
 DIST openssl-0.9.6.crate 86211 SHA256 0c00da69323449142e00a5410f0e022b39e8bbb7dc569cee8fc6af279279483c SHA512 dacd50f81e6509e7508a1a74b949b13f3500ab2774c306d4b46a2b48b70c7a3edc41ca321b299be56491469e87bbec5a19320b89f1ae426ef30058b480c111c9 WHIRLPOOL 0c1e6b6338466c049d59514ccd2289ae062cff6aec428f4e02a9c4d5362ea6322ef2e96faf098991859465ea253419ce48541c06e7d528bca276218457d30373
 DIST openssl-probe-0.1.0.crate 5638 SHA256 756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919 SHA512 044a4fd477420a511a01971b3e0373971b7c06f4a8e3f039745a71b84c652048437260d608997ee2499e0afb886e8dc637e9086545075eb3ea6979967d937c10 WHIRLPOOL 3865605b22292d5d65a279cc649c56dff90648802f73cc72bad8e34dcd0a3b43f14b443980d08a5cd13b6c86b1d24dae2f67f8b966c4d5652712f8e2a13430b2
+DIST openssl-probe-0.1.1.crate 5668 SHA256 d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf SHA512 442617fb5d7f540ff05dc25c7364e180a7f4620848a2eeec31afa5a59ad6ef1924dc6254d24d5c73f356532794ce3cceae353826bb78d061edebd5fdf60296b1 WHIRLPOOL eaeabc41567b6a091abb20da4858aeb89e73f78067a6f9b35c2c3d0e6e0bd74e14a80071fcb2cc3316568dc7d1c1afb901cf49847522c2e1cf9da2fd35a62393
 DIST openssl-sys-0.9.1.crate 25655 SHA256 95e9fb08acc32509fac299d6e5f4932e1e055bb70d764282c3ed8beaa87ab0e9 SHA512 5ec32c40d96b696b954e2a451f6840ca17ba0c9f59fe24e55708075a6615fddb6ab403058b45ffe1acbc0e8d0e418fc47fcff09c65bae56203e98b1e240814ea WHIRLPOOL 2a94176bbaaf867edd0b7db0df5e2214e7fd8faf6134379cda6cdc52d8f93400c455f6a865bd75557402f1f8389dea965a103f02a799ab59bf0266be702b91dc
+DIST openssl-sys-0.9.13.crate 34706 SHA256 e035022a50faa380bd7ccdbd184d946ce539ebdb0a358780de92a995882af97a SHA512 93066afbf3a3dc05e9b1019f75c5892d31a539d002a3235093a62b6767be148b8fbdeee4671041868973f828c5da4526fa02e14cdbd2c4bb0c77e5a22fa048ec WHIRLPOOL 9d720f848ee1748a4f488ae01a10826cb4d0749124957cc5f543370a367fadc4c391aefdc06608c99fa952f33f9124df0b670698f6ca238b3cbd08ea5658db9b
 DIST openssl-sys-0.9.6.crate 28093 SHA256 b1482f9a06f56c906007e17ea14d73d102210b5d27bc948bf5e175f493f3f7c3 SHA512 b7f3b7a0e0b7cb34c7b1f65efc32738ccf40a2ab93782722a5655cfdb0e2feb566e1a53c8121c6d2e16794f26e817aac1455a39f8c422616fb4660478b339d8d WHIRLPOOL 1b9c5025d0b0b6b2eb3a0b570ceb9c42c7f86bfef3e57c0e3429caeeddc041919118d95d981fa1a4e5065e6701dc609633b021fda317a47838842894fb7a9223
 DIST pkg-config-0.3.8.crate 10814 SHA256 8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa SHA512 a58102ea0c6063c53e45e2f5005888fcac7a8e27dceeae4fae8d672ed0690f062386fe175c968b17c127b622b80fd319448faf9fe8ba3422e24f6fa17e8ccb77 WHIRLPOOL b8921e822910523910fb1e9437dedecf55f640bec605f96cade50783f58ace3f8931d76f5a573b3c0ebd5f4134268d17eb7dcff134accf88a880b9064e67680e
+DIST pkg-config-0.3.9.crate 11055 SHA256 3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1 WHIRLPOOL 6073177f5b36748407371a8199d6b441c2baef4638157541da2aa370ab249a06ce72e7aba01946f9d44c81f1391e34958b3bf42a64f150b3b7d5148d93026a12
 DIST psapi-sys-0.1.0.crate 973 SHA256 abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478 SHA512 512ac5b4f71b46aa74a856844a43092d236eab95eef7f6913e04553c9f699a3d36e4449fe6f1718426bc7d89787d891a066b315646a57961efe8b0de59ad8557 WHIRLPOOL 3e897e4406b038acde39f21bffde14f33d08dc4fc6ac0048354d3bd7b435d7c48e21647804f65eb8f0997ee3631146e9d2ef10634895ecc819527b155ff01d73
+DIST quote-0.3.15.crate 12041 SHA256 7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7 WHIRLPOOL ad07bd2c4f5b95ce529ea8ced6f8fff4fcd7a7f48c56108932ad9b3e90c831ef724c46cb46117402fde275d98c208694483afb303a99ac2e47bc04092cc3cdc7
 DIST rand-0.3.14.crate 54768 SHA256 2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5 SHA512 f727b61f29567b7f322bb9500f01c81588b3681c379f366ef80792ea80c200747b136389a91e32bcff346b24894e7f015090c86960c74b72ced3187a709dfbee WHIRLPOOL 9a8c22f6e0dc63853b8acdbd5e4de1e668de25617f7ec9ecbd2c8727d8cc1a71fdbf99aa247c0141e58a23c6e7fc431b66921c38d46062a0149c750e0c8bbb02
+DIST rand-0.3.15.crate 55312 SHA256 022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633 WHIRLPOOL 069746a66bf09e20e8fa435c6f462f7c19468480adc42bb4802450eed93db38d4e530e647a4a0b6444ca3b15fc3cc2f470f9649b15c026cbcdfd2a44d491343c
 DIST regex-0.1.80.crate 185806 SHA256 4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0 WHIRLPOOL d49c2d648518ced6e1c2a115c5066351be0c68913187259d0e233cab3061aa2673ea8099d2595f2cf038b8103549ba781cbc28b0c798ed25338469e45fbe8c2b
+DIST regex-0.2.2.crate 193403 SHA256 1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3 WHIRLPOOL dafb61f75a55f02dd790201156f6dbf042eadf3b54c7e71732653e3dc8db4552f43d281d96a1bf196e7336b638cc97b5d24bb43f6223caf312cb7b0351be827e
 DIST regex-syntax-0.3.9.crate 117427 SHA256 f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506 WHIRLPOOL 7ee6a7b16911662acf6da0735216cf3d9236e20deffc01f52c2374af4077e22099bb48b0a8fe809fc2f690c858b47d631a605f617139030c5b5c2426ed4387eb
+DIST regex-syntax-0.4.1.crate 121453 SHA256 ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f WHIRLPOOL 841c41fe9ba5fdc733d93944252c4e7d07b448435bf620baefc8db28a9e3891e97f619361cb1c80adc00be5be8721bebe36b85881b68035040ab870a23615b62
+DIST rustc-demangle-0.1.4.crate 9438 SHA256 3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95 SHA512 928cf5537343ad3bba3aff4b09dc51921b6823dc7a450422b363cfcb84ba65e19393dbcf67657197cf96fdb4b9b0195f42b3973473f51085610c90c8b49c4e9a WHIRLPOOL 0bdb37e0cff63b2eac66025c947dc673a876d6889afda805ae5232b341618585d83f9bf0db33ee0ac96ac56472a43b4c2ee5e6b55c5f8ee811caebd3ce47184e
 DIST rustc-serialize-0.3.21.crate 45393 SHA256 bff9fc1c79f2dec76b253273d07682e94a978bd8f132ded071188122b2af9818 SHA512 c49d89841b983bbe3a121187146452f83ea196064c25b94777b0a282a4b79c5ee99fe45c8bfd897d0832e8bb508c1f1c0fb9cfb7e5f6b81633cbf821ea0d54f3 WHIRLPOOL 56513fe21b3fd1978879580070cfe99eab48d98a506dfae56d252e99834d01b3ae21d8f7565b65ea4ee4d5bfa05a794ca931add15599b8f799d6fa2fddbb925f
+DIST rustc-serialize-0.3.24.crate 45926 SHA256 dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884 WHIRLPOOL d50e31f9099297b25614dde4bd1147e8b75f85eeae4fc2ab013586be7e5d345705671d805ef20ce285c41065545b38d548c4e8da4d248c3e455f888c6755e091
+DIST scoped-tls-0.1.0.crate 8523 SHA256 f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d SHA512 3791153856298ffe3821d6cce5c8dd011c068e859e5f7598d05b85885eadeb4e6edc1befa9fdb27f708d13d5d7c20645ba8f29637026c9d0ff105255e019b9ea WHIRLPOOL 71d123a71cade1d33aa19bb64de6c651a1a5dc5c322ec2dc68aeb0524d3110f5f7cccd69f9a340d847f7da03ef677bd751d615eb21a65088bec15d64603dd1cf
 DIST semver-0.5.1.crate 15586 SHA256 ae2ff60ecdb19c255841c066cbfa5f8c2a4ada1eb3ae47c77ab6667128da71f5 SHA512 bd96a216dec5d6007f2536979d24b7c4f81b29ccec8e588bbe796f34e6842102175a47d72f3fc8b96c51f9ede0968edd2c647fd1176eddfa26c8789d8d7f8318 WHIRLPOOL 9332c70567962635ee9000ad65cecbc7f67978a57e111a45f3eb62296de252b020c1dd8adbff92feb6c4d66332f73d514b3607bbc79e6a144149abb884290592
+DIST semver-0.7.0.crate 16497 SHA256 3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85 SHA512 1eb3223ba04b5d7e67ca671cec1fca7c5c262082db8834bce1487be083035ff119c22a09c9cc957b474fc89b8ac29637f6a75d0ea9bf771e8ad3710c202d1510 WHIRLPOOL f736736835e1e358fe94516776802f064b001e893d4c862719e85cd0d728eaab33c323fe1088583f932f0ec079c78cb37e7f76d2ca2913f27c4367a541776341
 DIST semver-parser-0.6.1.crate 4860 SHA256 e88e43a5a74dd2a11707f9c21dfd4a423c66bd871df813227bb0a3e78f3a1ae9 SHA512 25324af886c06889c16acc3f99aeb85eaab07ac851d398a07742bfdb970c2dd71b0a24dd4feba8004a529a0f541c97e3571540194870fbaac44a31adc5103f49 WHIRLPOOL 90ada03a6f32d21634154c12b27d790e5a9ae0aa1eff03ccba92868425f90fe23e1ace4f9500bc1c6c93daff44eceb193df20ca2b2f03eb7e5d09dcd9e3f30e6
+DIST semver-parser-0.7.0.crate 10268 SHA256 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f WHIRLPOOL 672ec12b37a4fdc72aaa6fe8166c06cd442ac3960caf7f13aa1c6bee5ac254fc54985b47744a699442ca63003bbc3c5b504b49afda662881881f4822ebde19b7
+DIST serde-1.0.8.crate 59699 SHA256 c2f530d36fb84ec48fb7146936881f026cdbf4892028835fd9398475f82c1bb4 SHA512 743ab9518935ba219faab7f61f3ce30d6e20c20145ed9ebe46df49e570e74063baace630eacaad2f3b7e9e0030b64faa428810701537a6e2a5224802bc55edc1 WHIRLPOOL 08a5533df2527b11300638991ca9706c9df4213174068d14a0b3cc2362358858de6ac0b6faab13ff65b1258ee34301a6150cac14abf0b3c0c80e026800d1a609
+DIST serde_derive-1.0.8.crate 24015 SHA256 10552fad5500771f3902d0c5ba187c5881942b811b7ba0d8fbbfbf84d80806d3 SHA512 685446ae6077ac8e730358d8676e9648ed0dca3638c16ab3b14ea0e6823f1743af1b41933ed2b8f4f5e497e8954c954c40dbbe8f8e6d66a0b0caf3cbe2612a3a WHIRLPOOL 2ed002ee6bcacffb39f0a4c09aad9db334860a1f540f53dcc8430bfca9d18c4c9f338f996d90bb20c0aea11613bbb593bfe759fed55834c0c8f69d774265bb48
+DIST serde_derive_internals-0.15.1.crate 16441 SHA256 37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a SHA512 5599b3022f9a1f16566c4d86ae2f173373905ec318499ffe28a061e58494f786d0e6dff6ca962422bf6d773604b66f62b0de8e19cd39057456d50e923180a41c WHIRLPOOL 3ee996a658dffa01f06447297774b872a55b032d13c5dc40a2eabaa7fc4a797564e8bae045a964fcdeecc47761f63e58049a2d3b236cddbc8d84b33473823e5f
+DIST serde_ignored-0.0.3.crate 9476 SHA256 c10e798e4405d7dcec3658989e35ee6706f730a9ed7c1184d5ebd84317e82f46 SHA512 9d73d559cfe7dbe5ddb2cf9b3952f2c055eb607722b017b102470995857eadbe5ed6bff9c7db277c6de203f09841ec4208480857d5d6269d7b267e7373d26728 WHIRLPOOL caa1bb5b489fe69c0c30c8691370156f8d16379a1f77303cc56494af5e6efdd6e9f80b34609a2a311e23f0f1a34e7b09e3f733c01f83dab65237ba727b1f1c6b
+DIST serde_json-1.0.2.crate 55422 SHA256 48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b SHA512 ff0a3806b138cadace0ffd600ae695047e6e75655699054e8974160619ae5a00e8d306b85dadb0f08672d16934f43870627e5619af29fbf68497638eb133d4a5 WHIRLPOOL e75c638e862a67693ab1a0f280e61723f3fbfad60c6a51358cffa70a8a340642cea9897e1f687179293e28c75eee294d5a06b56dd6b706bee1111e4852cfdcb8
 DIST shell-escape-0.1.3.crate 6441 SHA256 dd5cc96481d54583947bfe88bf30c23d53f883c6cd0145368b69989d97b84ef8 SHA512 d5a8bfc9074163396e7362f9a3b57374bda3fc4635b8adadeb24610d14b051cc55cd8a9ec3ccc71b107cce57b262e2605f7c88a9cb21da4e442fe207e3397b97 WHIRLPOOL cf2ae13252712e92735cdcb141940162bd334241b6ba7ba0270c5736be15cc0e3c7a8767902ba7d65b1b5892244e7eef96db87b2b7ef3647a2d52fa2535bcda1
 DIST strsim-0.5.1.crate 598561 SHA256 50c069df92e4b01425a8bf3576d5d417943a6a7272fbabaf5bd80b1aaa76442e SHA512 34b298df18d71121d515545e3ed0f52130366b6d3ddb1075736754f736ec40438c9d3ded75f675904a9d72e2efb88ee9462211e212a6ce10d210797c91724ae5 WHIRLPOOL 77ce40b5f23f2eb92d2d65f0f7f1a8d3952bee65ed0d493f855583d36625fb58a90334a5e23c15f650600cdeab0b23f13959eabbcd3b25a25947696e9d973e6e
+DIST strsim-0.6.0.crate 8500 SHA256 b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694 SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97 WHIRLPOOL 5fa5b91b22ed2d5ba22da674568e5ea374fb05d722796030c3d5198aa42552f7bf47b51b54ea6d62b4e9bbcfd50bdc7ef450ac23e6e2e99dc00130b972b460ca
+DIST syn-0.11.11.crate 63309 SHA256 d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e WHIRLPOOL 3ff71650638d2bdda933270140b04874fdc896bab2156193ac8e8bdc8ae96146a04f28e6ed0a7531c33773e46bfc757d06530bae9fb598ece13b7b3d4e6041fa
+DIST synom-0.11.3.crate 17120 SHA256 a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e WHIRLPOOL 666714780fd8450258f6a5c776c307b9aa1f6c043014d40083a10b7e4a48b3ebc36493e069a2764d60b71e61ffb963d5ebabbcbdf3d1a3cebfe9f2cd0298dc45
+DIST tar-0.4.13.crate 39373 SHA256 281285b717926caa919ad905ef89c63d75805c7d89437fb873100925a53f2b1b SHA512 0cb42bccc898a3f454b37e966894e0faf337179f678e7da9a2bd06fd0fafd1c5e282264c65d910a9fd6959368671967f7b40fbd66cfbe4f5434683f0249f911f WHIRLPOOL 08df7772280f95bc91d943c35d7201ee0911818fd0bab4e68672cbc3c3e9527bdcb224fef68473ebb5c8aaae2d5e2b7716f6d9c603056c1d159dd5819a45e0a0
 DIST tar-0.4.8.crate 35295 SHA256 12e1b959f637c2e4c69dbdbf4d7dc609edbaada9b8c35d0c2fc9802d02383b65 SHA512 2b31523b565cf4b1d649c8096f0b8bdb7c416c8910189d3bae6fa9027983968c62af76c8c727482a68bdceb1ed39fd2d72729d3fe63185e0da46d6b3a910c408 WHIRLPOOL 9f58919026f61cee7a33b82cb226b925561c8431ad78eb9599b3cd567c4bb51ce3eee13ae5ae222b5a8540aa9fa2c540362dcbc8df89a080968fe1b167e24b6c
 DIST tar-0.4.9.crate 36838 SHA256 0c9048e27119ff1fcf5b0e147ca0936d911b607d87440b042d4ecaa111b523ee SHA512 d74b493b2e903aa2b7bc954edeb53b9aa459622eb305b2b3fd50a3754137485f8748f9d8c978d47589d0c6c8ae6536e828b4a63165314e9028bfb9aca3d3248c WHIRLPOOL 3b902160bc8c695649a6cec79ff86af60ff2e8ae9eb0e175122f80dba6af8eafe0b515761adfa874a6dccda61d0918362348058c36d3374c994c617f348a6f37
 DIST tempdir-0.3.5.crate 10605 SHA256 87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab WHIRLPOOL f3e3e70e9f0f5d9eb38e0b33b5f58f480d321ee5feb8bf682f7a6b80b433a3740594393f3d5c13d7dcb1f733dfa31fec338b321955f2b631ec4c4dacb56c23b4
 DIST term-0.4.4.crate 35853 SHA256 3deff8a2b3b6607d6d7cc32ac25c0b33709453ca9cceac006caac51e963cf94a SHA512 df99c7273ca6f97ec3d9206f98601540d26370124a7a5404cc072bf2e6621bc48fa74101e60f29bea10869278401193648e253fc2029f4cf8e3c8303625b11f7 WHIRLPOOL 57de8f4d686d6806fd18a3de9ead347d2c4c8b63af5175d3c2df4e894ffe13b62caa93774bd320e3d2c42108849012071bce8c07414856af8374884661bd164a
+DIST term-0.4.5.crate 37496 SHA256 d168af3930b369cfe245132550579d47dfd873d69470755a19c2c6568dbbd989 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc WHIRLPOOL 376fdcb7b4831d29c24e1f288d29fc156bee1d1d9b8d857698757d059d4f940b0e17621d374dace7ec3eee0b4e786dc19ab249090d05cbfc60ea110fb6fce390
 DIST thread-id-2.0.0.crate 6108 SHA256 a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03 SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0 WHIRLPOOL 88a26709bb3a6b27ab102e4414d25f20361ad92be89662c59c14ceed8a84eb17249ece8f250fb082e85acb75835ea81d1f5b62358e57e1bb1bfb96dac5d6e1f4
+DIST thread-id-3.1.0.crate 7195 SHA256 8df7875b676fddfadffd96deea3b1124e5ede707d4884248931077518cf1f773 SHA512 f24b2608cb476829d43b71aec0e12a12123a8943402755ec44f5eb4974e63ce7ff1d75f5046ddb533a08447c98758c226163e461c52413091d85f6267a19af13 WHIRLPOOL e0c9b03549c83ff4c5c519195ca70e055b4a8cc32d3c81a46a75564cf24caadc49f5672770b62db37eaf8df84428bd3baf4ee80bc47dd1262e5e6f4365cf27d9
 DIST thread_local-0.2.7.crate 10954 SHA256 8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35 WHIRLPOOL 5988b0a217254ee39387b34dcadd9f44243a2403fabb33b3ce56415910b27e0ff887ec209af1f25e40ed4f3646e840a903f156c5546b20b640aa44463adca44b
+DIST thread_local-0.3.3.crate 10964 SHA256 c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7 SHA512 19b4d445c2688898d149a05aec7c157f5c8cf48a60fa98b8890bc70ee8f391fc94d454ec218002063bbaaa715326957ab2dfda0537b782a2643e908b64e0f22d WHIRLPOOL 2da568ac1d56844575733a502d25e1ae1140f1055ac1057a1656127b29eeaaa99bcf4f4897ad81848f907a3bd053724dc192596f53efc702b399c78e2cf3a64a
 DIST toml-0.2.1.crate 47258 SHA256 736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4 SHA512 e802d66d207debc8f5d7655c0eb797fe09125d5e85fcf4cc8c3088d9811b141f8db40b9a95f76df271a9d32640a8e59f1e9520da670f0a994bc73994552cf4bc WHIRLPOOL 861e11d6516b0df336c8054093da769ca13beb745dcda190e629a3227bd50edfaee3e4b8367a430be285be877bc52ce2d2c74a562c1c2b23f39cd907a18b1588
+DIST toml-0.4.1.crate 54017 SHA256 4cc5dbfb20a481e64b99eb7ae280859ec76730c7191570ba5edaa962394edb0a SHA512 ad603d1011c253eda1366fdc9781a8d5f6c3792cde26cac2552e2aea2ab7e2a926257587362d5c11518e397a96d59a4c38b0418eaeb5c584c83a37850d488480 WHIRLPOOL f7a3c20de30dfdb4178ee96b98a059a36cdac693bf9411877481d4301b9b6d44a5bb6f5f98b0c8b27edec3fedf55e80e8cafca447977a9f6f929af682e6b3e6a
 DIST unicode-bidi-0.2.3.crate 1744003 SHA256 c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f SHA512 fb067746b4788c7110bc2687850dc11183c7e596453b42c0c4764c59c1686faf4d03a52b6c147c6578d88b8a2f3f1257d88010874b6ff0bb942b41e055c00a08 WHIRLPOOL cea3be7073b65971b303213f2eec72035c80b65bc306231e2af067ec58cfab3ce2d2a1b38a2e4a5a537a94e7458573b1cc7cc8b44aa3b62a2595ffc532343b11
+DIST unicode-bidi-0.3.3.crate 35909 SHA256 a6a2c4e3710edd365cd7e78383153ed739fa31af19f9172f72d3575060f5a43a SHA512 5fdfd49234f98dccf4b12f28d78b0fbba046df9eae9ce94ef829f3973ea24016819607239ee329d524c0937702aeb897b1c91c5e579d3e8e73a560b803ddfbf5 WHIRLPOOL 1c60c3b0755e84e000a321d6de101529f4d7566740646dcbc220feb6d0beead1b122959dbef31bf9fcd0b5c13e1b214e0f7e67a7fb61d0096c5701dc46181598
 DIST unicode-normalization-0.1.2.crate 612931 SHA256 26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172 SHA512 b6dc4316a875de59ee00f89ac0e9b255d0111dc2e2e45395ed726282502ab7b6cfcd56acff7f409b97a2f36d5278e16936359791be6bc8fba1213ca6c8a888df WHIRLPOOL 89b477db1efd9ff153140c485cce0d4c0457ccf30fa8ad765fe14a27e94f8506521b64dbbee7b300da2786e139738583ce255b78192534d63aac9d2fd833cc92
+DIST unicode-normalization-0.1.4.crate 278063 SHA256 e28fa37426fceeb5cf8f41ee273faa7c82c47dc8fba5853402841e665fcd86ff SHA512 abfffe2cda35c9f00bca52ca3459915d3790fcb8333b0df629c6cb59e339ef5077a7051cd0c1f7fd919fe8ff12da13600a32c8117e4e1dbae7d138ef056b7c7a WHIRLPOOL 0ccb23c81839410add3aa4ab5957f8b508ba161909197fa9df3b53e52f6c61a16b06812dc4665ae0ba5418ed9e946501789a217e1993094ee368a8a55a2ae76c
+DIST unicode-xid-0.0.4.crate 16034 SHA256 8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091 WHIRLPOOL a66e7aab6163d220173d678a374b2a624a83e619a212a7f38602f550f2d35f614fd2a1024deb66a03cfa5c513787563455b3204157a40f2e2415afa51ff1bec6
+DIST unreachable-0.1.1.crate 1772 SHA256 1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91 SHA512 81d7e8740630ef90341bed76f5be55c928c1f28cf46ef23431a7f610445cae884eea532df805784b2fa04034e831255a3102a29fe2c228b8c1c1afe15d01cca0 WHIRLPOOL c37385d8bc63262243d04ff7c9bfee7180649d715a148bb6b09a84745e9dea4ecfd0aa0cbc53d3cbd6036cbff214b00dc24cec2148e36beda64be2b7f5d6f4b3
 DIST url-1.2.3.crate 68790 SHA256 48ccf7bd87a81b769cf84ad556e034541fb90e1cd6d4bc375c822ed9500cd9d7 SHA512 6415f77b2226c79a340bc6f1061b835700a3ed9cfac4d5357ae8de947131c79d9a87150a59178c2fc8101b642d884c4ef4fecf657b3f89220aec130cae7c822f WHIRLPOOL a9223ac74bfbec538da4ca0f1c5df0add8933b123fed263e30add8c106608704990e5d9064821c79fa05f6ac4e0e9965ede2b8894ecdd57fa02a4955e666e132
+DIST url-1.4.1.crate 72273 SHA256 3e2ba3456fbe5c0098cb877cf08b92b76c3e18e0be9e47c35b487220d377d24e SHA512 84d4917f0daa83d9b361ea0fa24ac0cfc3e76d66cb9ac7791ca92053f8c07b38aa165a6a4a6b56e5ac07434fa50b28984061e7d95bab1166d9169e7987bad7f9 WHIRLPOOL d662f0a38515ded5f4d41029a40887b484ae8df86d2aa1ccd412d0cf87e837e3cb7f0478cc1c0cba2d2ff7c3f2df03e42b8ad451bc2c50a388d85dac0753f6d1
 DIST user32-sys-0.2.0.crate 10624 SHA256 4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47 SHA512 75fa43621acff70425ca40a132a25fc67923526c895c51edb6b49ef507d1d461383e1d92b5dbb5c5aee9207cc76b9a9e43d27efa0b65476bc5ae0c122a2dcc19 WHIRLPOOL 38379a094f27223281e0c0d300a552ab4bac3b03e3f12ccf4d22c092e19b2b1478cd67ea1a5000015b19679b3cbc0af352724c7413aba0b92dfb6197e04ac936
 DIST utf8-ranges-0.1.3.crate 8422 SHA256 a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374 WHIRLPOOL 05b6f88e1ba81a2139d38d0feb60781976859adfc46731ef322a552b17db71e0bf61c6626432812fb2e0ca45ce10a5438d9dcf218a962ef7415187adaa0280fa
+DIST utf8-ranges-1.0.0.crate 8599 SHA256 662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643 WHIRLPOOL 58e23f2f0bbf86a8336dd16082fd0f00d32357b0ca1b3620634c54cf2678b7e27a1a8da91cc3d72fe8325e34fe3a06ba4e290bb71cae47d6ee8eb77b8599b59f
+DIST vcpkg-0.2.1.crate 5446 SHA256 4ec083fe2a55f0c710db951078348f978d4132a702d45d7e4702ed9221f5acad SHA512 81b3f7ccfd29fe09620f7a952e360e949cdf0a0cf06b698aa65861a00fb5b8d6ab35292a3b9b3444947790a59b34eaeec0cb31bdad25da389c10320fc5581791 WHIRLPOOL e0d6410bc8a35219ba56e90f527da9e2df16b7d48c4ced18c4d8d50f50a97b89bd43c464c82bdc72a7a8f943313cd3f872fef2d1183b3a7353752c320771839d
+DIST void-1.0.2.crate 2356 SHA256 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 WHIRLPOOL a1e8bf644e79ce0bfcccc2b05ea357400fe6cb61bcd4adb0360b109affb866ec305b30a11549aa35b765fd0f32420e7d5cc741cfccd3c2263c60f1cf7acc0136
 DIST winapi-0.2.8.crate 455145 SHA256 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe WHIRLPOOL 3dce71a6927320e3882ba60a24630a9ba8d123b73d8da6b9330e422580af9d9b0a96748d7368767e3712185877ddec6978b924d40428341c4de19b76ed375af4
 DIST winapi-build-0.1.1.crate 669 SHA256 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 WHIRLPOOL 036080513776fe806cc9dd68bbf5b797776b98ca9fdceaa4bd77c87c66d2e5bd0eec8b0e7f0100dab8f2ced754da058f67e651002c786b4992c2be416a5d52ff
 DIST ws2_32-sys-0.2.1.crate 4697 SHA256 d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f WHIRLPOOL fd144081dc48c18ca407c1af08411d3aecf99cec42d27a3b7825d16f91f15be96ab66b79c62083520fae6988af76dfc20fe028416f84cfb5a0e1de9bfa4ba107
diff --git a/dev-util/cargo/cargo-0.20.0.ebuild b/dev-util/cargo/cargo-0.20.0.ebuild
new file mode 100644
index 000000000000..25f1a84adc87
--- /dev/null
+++ b/dev-util/cargo/cargo-0.20.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CARGO_SNAPSHOT_DATE="2016-09-01"
+CRATES="
+advapi32-sys-0.2.0
+aho-corasick-0.5.3
+aho-corasick-0.6.3
+backtrace-0.3.2
+backtrace-sys-0.1.11
+bitflags-0.9.1
+bufstream-0.1.3
+cargotest-0.1.0
+cfg-if-0.1.0
+cmake-0.1.24
+crates-io-0.9.0
+crossbeam-0.2.10
+curl-0.4.6
+curl-sys-0.3.12
+dbghelp-sys-0.2.0
+docopt-0.7.0
+dtoa-0.4.1
+env_logger-0.4.3
+error-chain-0.10.0
+filetime-0.1.10
+flate2-0.2.19
+foreign-types-0.2.0
+fs2-0.4.1
+gcc-0.3.50
+gdi32-sys-0.2.0
+git2-0.6.6
+git2-curl-0.7.0
+glob-0.2.11
+hamcrest-0.1.1
+idna-0.1.2
+itoa-0.3.1
+jobserver-0.1.6
+kernel32-sys-0.2.2
+lazy_static-0.2.8
+libc-0.2.23
+libgit2-sys-0.6.12
+libssh2-sys-0.2.6
+libz-sys-1.0.14
+log-0.3.8
+matches-0.1.4
+memchr-0.1.11
+memchr-1.0.1
+miniz-sys-0.1.9
+miow-0.2.1
+net2-0.2.29
+num-0.1.37
+num-bigint-0.1.37
+num-complex-0.1.37
+num-integer-0.1.34
+num-iter-0.1.33
+num-rational-0.1.36
+num-traits-0.1.37
+num_cpus-1.5.0
+openssl-0.9.13
+openssl-probe-0.1.1
+openssl-sys-0.9.13
+pkg-config-0.3.9
+psapi-sys-0.1.0
+quote-0.3.15
+rand-0.3.15
+regex-0.1.80
+regex-0.2.2
+regex-syntax-0.3.9
+regex-syntax-0.4.1
+rustc-demangle-0.1.4
+rustc-serialize-0.3.24
+scoped-tls-0.1.0
+semver-0.7.0
+semver-parser-0.7.0
+serde-1.0.8
+serde_derive-1.0.8
+serde_derive_internals-0.15.1
+serde_ignored-0.0.3
+serde_json-1.0.2
+shell-escape-0.1.3
+strsim-0.6.0
+syn-0.11.11
+synom-0.11.3
+tar-0.4.13
+tempdir-0.3.5
+term-0.4.5
+thread-id-2.0.0
+thread-id-3.1.0
+thread_local-0.2.7
+thread_local-0.3.3
+toml-0.4.1
+unicode-bidi-0.3.3
+unicode-normalization-0.1.4
+unicode-xid-0.0.4
+unreachable-0.1.1
+url-1.4.1
+user32-sys-0.2.0
+utf8-ranges-0.1.3
+utf8-ranges-1.0.0
+vcpkg-0.2.1
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+ws2_32-sys-0.2.1
+"
+
+inherit cargo bash-completion-r1 versionator
+
+BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
+
+DESCRIPTION="The Rust's package manager"
+HOMEPAGE="http://crates.io"
+SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	x86?   (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz
+	)
+	amd64? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+	)"
+
+RESTRICT="mirror"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl"
+
+if [[ ${ARCH} = "amd64" ]]; then
+	TRIPLE="x86_64-unknown-linux-gnu"
+else
+	TRIPLE="i686-unknown-linux-gnu"
+fi
+
+COMMON_DEPEND="sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-libs/http-parser"
+RDEPEND="${COMMON_DEPEND}
+	!dev-util/cargo-bin
+	net-misc/curl[ssl]"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/rust-1.9.0:stable
+	dev-util/cmake
+	sys-apps/coreutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	sys-apps/sed"
+
+src_configure() {
+	# Do nothing
+	echo "Configuring cargo..."
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
+	${cargo} build --release
+
+	# Building HTML documentation
+	use doc && ${cargo} doc
+}
+
+src_install() {
+	dobin target/release/cargo
+
+	# Install HTML documentation
+	use doc && HTML_DOCS=("target/doc")
+	einstalldocs
+
+	newbashcomp src/etc/cargo.bashcomp.sh cargo
+	insinto /usr/share/zsh/site-functions
+	doins src/etc/_cargo
+	doman src/etc/man/*
+}
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index d2fb5bdf06de..171f0d7ca6c1 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,2 +1,2 @@
-DIST devscripts_2.17.7.tar.xz 696252 SHA256 9c6dacf893eea1621950bc73b7d63711d3b2a8f9e9797060507b7ee2cee43f7b SHA512 9b37deb35a0a286b73bf83685a0734d736e5c3f929b777a048fa6b00e8da1253f50c0e7216c0bd637c354044f3b471ed1ab17932f689f0b140afe9f56926c4b1 WHIRLPOOL 03043bfc225edf8e86814f2b4a1a9ed889c75d92ec6ae169c3c76e5df5ca941e2b8c86afba6f9454534a424fbffb9d1283a1d55cb2142776f48e493c958d54ad
 DIST devscripts_2.17.8.tar.xz 696424 SHA256 7e39e296891d2d158b717c0c834cc0c5ab560e5c7d88910e42bf59cda10fbeea SHA512 1495a754346ec3903cb91d9d937b74a1d6a928a84028d19016b7a2d0df5c0f665aba7c777952ae57f5f8b421b696cf631c7a139ea68a98f31030c83b6e67d349 WHIRLPOOL d146b5e3317278b21c49c34af29877e0bb8f463c6bca9ec037953d0da9b53c8aea863d27691fe95667ebedc2d7b1d209d2593b51083537f9c0d8956a34b45855
+DIST devscripts_2.17.9.tar.xz 696500 SHA256 0ef164a9b8e774e8aef7a532302e7ce60ba10a72e56da485865222e68033b73b SHA512 00bc2fea2aa2f5806f6ecedee96c09c0ff31d99283e7b242f85c04a63310ada692df2bbef0cfde73dbcf3ac455026a5262b298fb2348528f2a9d7ce7916d97dd WHIRLPOOL 867d946c6d598ccb67e2e19a872c033d9c22b7b270cf2eadbc81da0d1d4a42d444cc705bff69b6b2e35006d72f6131ee101e34ced34faa8e89da7f950aca5c81
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild
index beb9a6b3260c..ac906202e791 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/checkbashisms-2.17.7.ebuild b/dev-util/checkbashisms/checkbashisms-2.17.9.ebuild
similarity index 88%
rename from dev-util/checkbashisms/checkbashisms-2.17.7.ebuild
rename to dev-util/checkbashisms/checkbashisms-2.17.9.ebuild
index beb9a6b3260c..8524418c7c9a 100644
--- a/dev-util/checkbashisms/checkbashisms-2.17.7.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.17.9.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
-inherit eutils
-
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
 HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
@@ -26,12 +24,10 @@ RDEPEND="dev-lang/perl
 
 S="${WORKDIR}/${MY_P}/scripts"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.15.9-command-vV.patch
-)
-
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
 
 	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
 }
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 99f096f04076..d078f51d7bcc 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1 +1,2 @@
 DIST conan-0.24.0.tar.gz 514654 SHA256 59ff6db2bfbbe5e2b5f31612a3a6be64844346359b64f2f78803af4f35dfe2e2 SHA512 6fdbf4731be6aa6fb06e2d976c97975dc4cdc60fb7a6381f99c83c19b73230de13c7a60bffa1ab6aac0d64ce20986cee99f98af986b23396107471ac804c08af WHIRLPOOL 3c6fb70b4c262d82410471d35c36118e3ae9091699ca06fc515f1bdcbc0c0da7632ae5a5b3f99de7f94448ea9a1c9dce1c88fdc3fbf09fb2c0afa49e458916df
+DIST conan-0.25.1.tar.gz 529592 SHA256 9277b00f0dbd67bb06eb9da539380d8c9797665ad07a9e60e12ef4e13bec16f0 SHA512 487a0dca79afd6f0b6d6907fe7a95c310e5b4c97787dcf390c0d5797552ab1ba3aee9a90d45c3c9ee302f4b1a6e13c44ca8c20b6f11d789ce5d6f6bce068e600 WHIRLPOOL 2c0ed02925c3f59058e5d09ce0b8016a8a65c8f4a5f769b3c50207c9f61ce038771c944c2efd9d08aa8b98c1c97f34caa5b9a2bb9b9f501411671f224b4727ab
diff --git a/dev-util/conan/conan-0.25.1.ebuild b/dev-util/conan/conan-0.25.1.ebuild
new file mode 100644
index 000000000000..5c95fc878d8f
--- /dev/null
+++ b/dev-util/conan/conan-0.25.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="http://conan.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+	=dev-python/node-semver-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	=dev-python/patch-1.16[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	=dev-python/pylint-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-lang/go
+		  >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		  >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		  >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
+		  >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		  dev-util/cmake
+	  )
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v . || die
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index bede85b055ae..368569d9c67f 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,5 +1,5 @@
-DIST jenkins-bin-2.46.2.war 70342163 SHA256 aa7f243a4c84d3d6cfb99a218950b8f7b926af7aa2570b0e1707279d464472c7 SHA512 6d998ff8b9da54817ef7b21038b4921cee77cb76011a5c7cca949f63c68eb318e21f6108c962e2b55ba7f9901da89fbab95c7cfd32ac6933658511040595f61a WHIRLPOOL 2eb04831f682be0b8dd2e58cb01a4442a7c0123524dd5ce2c7a9130f90bd415aef57300c7bf33e2812589bb4ecb72af4375a1222dc04f5fd88a9a7f102dc374f
 DIST jenkins-bin-2.46.3.war 70340821 SHA256 00424d3c851298b29376d1d09d7d3578a2bc4a03acf3914b317c47707cd5739a SHA512 c46db766647c2b49d4b454e3e5bf5073e5252a3a6b70c7860650a9586f7f63402d1eeca02b3baa51b35c876210f55938b7bbc60c052e9d689f1427e8d015b6a5 WHIRLPOOL fe51aaf452ba1013ea08d78c7cacd492bfb8b34905ba5af52de2e590318d64abfd0bda5c4329d7a19b02b07a80ccd8f8676a98d8fedbbcf34aeb00050eef8afe
 DIST jenkins-bin-2.57.war 70476328 SHA256 5d7a66864d0941629e1fb8ef82ed98a38e54da39f4a9f3ca31561d573e18b2a5 SHA512 8207174bff1395b017b78b9d99e26b612a138977e75a2e01f59bb17fd42ac4470b7ab3b0b4fa305741bf5bf22987a2e51d61b907cb69c7ccce1697edaf331f76 WHIRLPOOL 17267b5df3ca296f42f711d73070b2a0a54e1a5ec293200bc1fd312a5bfc32abe4dfd63d97e9bd0834640bd28c9d625520e5e221cdde6b48c40fad5e0ba87435
 DIST jenkins-bin-2.60.1.war 70611723 SHA256 34fde424dde0e050738f5ad1e316d54f741c237bd380bd663a07f96147bb1390 SHA512 0eef089380bc3acff62b5dcf2e36bbd7d5f973d269cc8d8d429bfaae80835dd321055038ceb0b7d39a6c291685347fa905a249f312c3970d5210450596b78518 WHIRLPOOL 2717a9dd9a3a678f563575c412c294d7c342e0414b59816715c7101d533fad090b06a87a050a9927957a3c512c33125b26107e0daa5120d42b01ad304b459911
+DIST jenkins-bin-2.60.2.war 70613578 SHA256 14d0788d89be82958a46965de039a55813f9727bd4d0592dc77905976483ba95 SHA512 310fd1054641582d189dc9f8057c03fdfc88ed1dfeee04dcc4f7d597ad6ce94a544b50b103dd4be1d39980afdee16e07634eeaf3b4887b5ce7c4d84ee4c22953 WHIRLPOOL 81c937f8356a7e55fb6f8cb77cf496ea00b997757ae73e5a2d27293dbb7e7aec44729e68ceaf28a0a6e971bc525fed9377c0ad189bdbf660ca43009dc794af28
 DIST jenkins-bin-2.67.war 71617234 SHA256 2def7deae23ffdcfece481548b3f6d7083d50a2696c91cfb5a9c5e84afcdf704 SHA512 c4b9af585888d2d1dd672569aeb92d2458dba808aa3cd664af31310cf847a7625afe7aad133f709c24598646b6e96d504bd53e54cf14490fbe756273b8494041 WHIRLPOOL b68d78f8e0dfddd3ffae89f2797b62b5a0480581b618f73dbeeff992eb961c52ef2da3de93170f3c97761dd4cf9f743d250cfc13e9fe99d92ea44e47659e8f1c
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.46.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.60.2.ebuild
similarity index 98%
rename from dev-util/jenkins-bin/jenkins-bin-2.46.2.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-2.60.2.ebuild
index 296fff22b7a5..fb976b69a9ff 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.46.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.60.2.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="media-fonts/dejavu
 	media-libs/freetype
 	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.7.0"
+	>=virtual/jre-1.8.0"
 
 S=${WORKDIR}
 
diff --git a/dev-util/lldb/lldb-5.0.9999.ebuild b/dev-util/lldb/lldb-5.0.9999.ebuild
new file mode 100644
index 000000000000..d1d0b573437b
--- /dev/null
+++ b/dev-util/lldb/lldb-5.0.9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
+	https://github.com/llvm-mirror/lldb.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit ncurses python test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+# swig-3.0.9+ generates invalid wrappers, #598708
+# upstream: https://github.com/swig/swig/issues/769
+DEPEND="${RDEPEND}
+	python? ( <dev-lang/swig-3.0.9 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm
+	fi
+	git-r3_checkout
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+		# compiler for ole' python tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove bundled six module
+		rm "${D}$(python_get_sitedir)/six.py" || die
+
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/meson/meson-0.41.2.ebuild b/dev-util/meson/meson-0.41.2.ebuild
index f8f747fa8377..493a4df2c561 100644
--- a/dev-util/meson/meson-0.41.2.ebuild
+++ b/dev-util/meson/meson-0.41.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc ~x86"
 fi
 
 inherit distutils-r1
diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index 294e27b019b9..1128615cd35a 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -63,7 +63,7 @@ if [[ ! ${_LLVM_ECLASS} ]]; then
 # @INTERNAL
 # @DESCRIPTION:
 # Correct values of LLVM slots, newest first.
-declare -g -r _LLVM_KNOWN_SLOTS=( 5 4 )
+declare -g -r _LLVM_KNOWN_SLOTS=( 6 5 4 )
 
 # @FUNCTION: get_llvm_prefix
 # @USAGE: [<max_slot>]
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
index 181d8018c739..230bea283233 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -1 +1,2 @@
 DIST zeitgeist-0.9.16.tar.xz 807092 SHA256 6ed3e60d0cd82ea58ee134c19beccafac10eb0f71977f3848755dacbf0927d3a SHA512 eb28215c937b71c8cec12f55236db4281ad529b2854ecb3c093477d45cd8348c6ea764e2cf00a99d41645b27b685a5325f0631b318409735b578a5871087b0f1 WHIRLPOOL 7ad3f528ffa938d14e9fbfe3f4e94ac5ad06bc48b13e261a0e8f43b88a9750a41d5e9212da7cc492f7c0197a4b12391d58e3f51a2a18a85b2663414332434c9b
+DIST zeitgeist-1.0.tar.xz 848740 SHA256 5ff508508f7a7b46acc9fbf1cf73fecb1aec214e18d9d22325aae8c2c2e8ddc8 SHA512 e8fa4db7202c5dceb6cb960775651624bdcd7fc2005019ff6491d7c139ccf036e865977adbd98ae3c9b97b22e5cf28534b64f01fde58b7bc89c0f0f8d13383e8 WHIRLPOOL 5c1cd4bb37221243726c7872d3a419cfe7523c053d6ac4dcced95c4ed1731110bea822b612c9fe9017bfeb35f37326dc9b810a2560b94324842d51a671ced462
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch b/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch
new file mode 100644
index 000000000000..c82db10ec3c5
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch
@@ -0,0 +1,38 @@
+From 662d359689834ea3d1fdb75050b4c97d2ad720cf Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 4 Jan 2015 00:09:14 +0100
+Subject: [PATCH] Make python module detection match detected python
+
+Some distribution might provided multiple python and configure can know
+about which exactly though AM_PATH_PYTHON.
+---
+ configure.ac | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a0330a6..703fb957 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -255,13 +255,14 @@ if test "x$HAVE_RAPPER" = "xno"; then
+ fi
+ 
+ # check for python-rdflib
++AM_PATH_PYTHON([2.7])
++
+ AC_MSG_CHECKING([for python-rdflib])
+-echo "import rdflib" | $PYTHON - 2>/dev/null
+-if test $? -ne 0 ; then
+-  AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
+-else
++AS_IF([$PYTHON -c "import rdflib" 2>/dev/null], [
+   AC_MSG_RESULT([yes])
+-fi
++], [
++  AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
++])
+ 
+ #################################################
+ # Summary
+-- 
+2.13.2
+
diff --git a/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild b/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild
new file mode 100644
index 000000000000..7cc47aea59c5
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION=0.22
+
+inherit bash-completion-r1 python-r1 vala versionator xdg
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Service to log activities and present to other apps"
+HOMEPAGE="https://launchpad.net/zeitgeist/"
+SRC_URI="https://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz
+	https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+ LGPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+datahub downloads-monitor +fts introspection nls sql-debug telepathy"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	downloads-monitor? ( datahub )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/json-glib
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	media-libs/raptor:2
+	>=dev-libs/glib-2.35.4:2
+	>=dev-db/sqlite-3.7.11:3
+	sys-apps/dbus
+	datahub? ( x11-libs/gtk+:3 )
+	fts? ( dev-libs/xapian:0=[inmemory] )
+	introspection? ( dev-libs/gobject-introspection )
+	telepathy? ( net-libs/telepathy-glib )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix direct invocation of python in configure
+	"${FILESDIR}"/${PN}-1.0-python-detection.patch
+)
+
+src_prepare() {
+	# pure-python module is better managed manually, see src_install
+	sed -e 's:python::g' \
+		-i Makefile.am || die
+
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--without-dee-icu
+		$(use_enable sql-debug explain-queries)
+		$(use_enable datahub)
+		$(use_enable downloads-monitor)
+		$(use_enable telepathy)
+		$(use_enable introspection)
+	)
+
+	use nls || myeconfargs+=( --disable-nls )
+	use fts && myeconfargs+=( --enable-fts )
+
+	python_setup
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check TESTS_ENVIRONMENT="dbus-run-session"
+}
+
+src_install() {
+	default
+
+	dobashcomp data/completions/zeitgeist-daemon
+
+	cd python || die
+	python_moduleinto ${PN}
+	python_foreach_impl python_domodule *py
+
+	# Redundant NEWS/AUTHOR installation
+	rm -r "${D}"/usr/share/zeitgeist/doc/ || die
+}
diff --git a/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild b/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
new file mode 100644
index 000000000000..196786ba018d
--- /dev/null
+++ b/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-2
+
+DESCRIPTION="Affiche allows people to 'stick' notes"
+HOMEPAGE="http://www.collaboration-world.com/affiche"
+SRC_URI="http://www.collaboration-world.com/affiche.data/releases/Stable/${P/a/A}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S=${WORKDIR}/${PN/a/A}
diff --git a/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild b/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..8426ed4854f6
--- /dev/null
+++ b/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-2
+
+MY_PN=GShisen
+DESCRIPTION="The first GNUstep game, similar to Mahjongg"
+HOMEPAGE="http://gap.nongnu.org/gshisen/index.html"
+SRC_URI="https://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-base/mknfonts/files/mknfonts-rename.patch b/gnustep-base/mknfonts/files/mknfonts-rename.patch
index ffd49997177c..e62618b7844c 100644
--- a/gnustep-base/mknfonts/files/mknfonts-rename.patch
+++ b/gnustep-base/mknfonts/files/mknfonts-rename.patch
@@ -1,5 +1,5 @@
---- mknfonts.m.orig	2007-05-03 11:46:27.000000000 +0200
-+++ mknfonts.m	2007-05-03 11:47:34.000000000 +0200
+--- mknfonts-0.5/mknfonts.m.orig	2007-05-03 11:46:27.000000000 +0200
++++ mknfonts-0.5/mknfonts.m	2007-05-03 11:47:34.000000000 +0200
 @@ -310,12 +310,6 @@
  			{
  				fi=[faceinfos objectAtIndex: i];
diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild
new file mode 100644
index 000000000000..5ab8dae2aeb3
--- /dev/null
+++ b/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-base
+
+DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art"
+HOMEPAGE="https://packages.debian.org/mknfonts.tool"
+SRC_URI="mirror://debian/pool/main/m/${PN}.tool/${PN}.tool_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+DEPEND="gnustep-base/gnustep-gui
+	>=media-libs/freetype-2.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-rename.patch )
+
+src_prepare() {
+	# Correct link command for --as-needed
+	sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"
+
+	default
+}
diff --git a/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch b/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch
new file mode 100644
index 000000000000..16936db956c9
--- /dev/null
+++ b/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch
@@ -0,0 +1,8 @@
+diff -Naur netclasses-1.1.0.orig/Documentation/GNUmakefile.postamble netclasses-1.1.0/Documentation/GNUmakefile.postamble
+--- netclasses-1.1.0.orig/Documentation/GNUmakefile.postamble	2014-06-10 10:16:08.000000000 +0200
++++ netclasses-1.1.0/Documentation/GNUmakefile.postamble	1970-01-01 01:00:00.000000000 +0100
+@@ -1,4 +0,0 @@
+-before-all::
+-	mkdir -p $(DOCUMENT_NAME)
+-	cp -f rfc1459.txt $(DOCUMENT_NAME)
+-
diff --git a/gnustep-libs/netclasses/netclasses-1.1.0.ebuild b/gnustep-libs/netclasses/netclasses-1.1.0.ebuild
index 2bf4ae0f9e4c..e488bdfd9933 100644
--- a/gnustep-libs/netclasses/netclasses-1.1.0.ebuild
+++ b/gnustep-libs/netclasses/netclasses-1.1.0.ebuild
@@ -6,8 +6,10 @@ inherit gnustep-2
 
 DESCRIPTION="An asynchronous networking library for GNUstep"
 HOMEPAGE="http://gap.nongnu.org/talksoup/"
-SRC_URI="http://savannah.nongnu.org/download/gap/${P}.tar.gz"
+SRC_URI="https://savannah.nongnu.org/download/gap/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${P}-no_rfc.patch )
diff --git a/gnustep-libs/renaissance/metadata.xml b/gnustep-libs/renaissance/metadata.xml
index 5bd929ead8e7..c3412174d787 100644
--- a/gnustep-libs/renaissance/metadata.xml
+++ b/gnustep-libs/renaissance/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
+	<longdescription>
 Welcome to GNUstep Renaissance!
- 
+
 GNUstep Renaissance is free software (GNU LGPL), and part of the
 GNUstep project.  It is a development framework which runs on top of
 the GNUstep libraries.  It also works on top of the Apple Mac OS X
@@ -25,5 +25,5 @@ from the XML files, and the other objects in the application are done
 via outlets (as traditionally in OpenStep); a new quick and intuitive
 syntax has been developed to make creating outlets as easy as
 possible.
-</longdescription>
+	</longdescription>
 </pkgmetadata>
diff --git a/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild b/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..e40d9a4d76c5
--- /dev/null
+++ b/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-2
+
+DESCRIPTION="GNUstep Renaissance allows to describe user interfaces XML files"
+HOMEPAGE="http://www.gnustep.it/Renaissance/index.html"
+SRC_URI="http://www.gnustep.it/Renaissance/Download/${P/r/R}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P/r/R}
+
+PATCHES=( "${FILESDIR}"/${PN}-0.8.1_pre20070522-docpath.patch )
diff --git a/kde-apps/kdav/kdav-17.04.3.ebuild b/kde-apps/kdav/kdav-17.04.3.ebuild
index d569cad24fe5..287605ef4f63 100644
--- a/kde-apps/kdav/kdav-17.04.3.ebuild
+++ b/kde-apps/kdav/kdav-17.04.3.ebuild
@@ -22,3 +22,12 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
index f49c53d3d045..9197337c48c9 100644
--- a/kde-frameworks/kdelibs/Manifest
+++ b/kde-frameworks/kdelibs/Manifest
@@ -1,3 +1,2 @@
 DIST kdelibs-4.14.32.tar.xz 11640860 SHA256 2133e863b21c197c75bd6a6ac60773422ef026c33acb57b8c7628a09f483bd83 SHA512 06cc64b79758d4dbf676eb6bbf56c1bb2820f3405c61e4d39e4e68a3ecd7db4afcf6fca1fcfe870dba9f8264b56aaee72d0f06da0923d2befd6ea56aa5adba22 WHIRLPOOL 4477c6d60c1df6469e6e1c66d8919c8f6432202b8c864a442226aa220f436971185337cb661b0f8e3e90d3e0dc7bdc0657994198003d6ef5ffb8bc8e604c45b7
-DIST kdelibs-4.14.33.tar.xz 11644596 SHA256 b8aac286955d3d29e4d3a69f7a267d9c8ba62a884d8e3b9298588fd4ce542415 SHA512 d0d2978669059aa9d2e7fcb1ae0046e1c7fb86153c82401726693fa5633b89a5929aa81287c219d5584e7ef904f93a21819743dc359e4c249d5128382d5826a7 WHIRLPOOL 7054ccd69291d77ca47fcd4f17b8d1d1e5d9445a803310504abb3f2d17fc4f837f33c0c7b1a3d9ad90b3397fed0b6db40dc9e5d11c721779e8e12c47388cffdf
 DIST kdelibs-4.14.34.tar.xz 11644736 SHA256 777d3433555b3257fe67167723020bb7f0da7b16daeace9910751e4b9bf9bcfb SHA512 57ba1591e6996af79f03e8a3d4d0c278c027ad65c717fcbdb857df68a3df47ddec6b7c34dfd682d590bfa9ed6800974b53ff29aa7ab73522caebc9897cbd81c0 WHIRLPOOL 7c1f318edadb6625acef33891e8fb751dd0c783a05f0e4bb2b77376791c43fbfee20bf8b72aab719bcfd8d271294263f2fc57912fd09edb38589a37d8a01c968
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.33.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.33.ebuild
deleted file mode 100644
index d049eb94ce0a..000000000000
--- a/kde-frameworks/kdelibs/kdelibs-4.14.33.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-APPS_VERSION="17.04.2" # Don't forget to bump this
-
-DESCRIPTION="Libraries needed for programs by KDE"
-[[ ${KDE_BUILD_TYPE} != live ]] && \
-SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
-cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
-	dev-libs/libdbusmenu-qt[qt4]
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt4]
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-misc/shared-mime-info
-	acl? ( virtual/acl )
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		!kernel_SunOS? (
-			|| (
-				sys-libs/libutempter
-				>=sys-freebsd/freebsd-lib-9.0
-			)
-		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( app-crypt/qca:2[qt4] )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper:= )
-	kerberos? ( virtual/krb5 )
-	openexr? (
-		media-libs/openexr:=
-		media-libs/ilmbase:=
-	)
-	policykit? ( sys-auth/polkit-qt[qt4] )
-	spell? ( app-text/enchant )
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	udev? ( virtual/udev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-qt/qtphonon
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	kde-frameworks/kdelibs-env:4
-	sys-apps/dbus[X]
-	!aqua? (
-		x11-apps/iceauth
-		x11-apps/rgb
-		x11-misc/xdg-utils
-		udisks? ( sys-fs/udisks:2 )
-		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	)
-	udev? ( app-misc/media-player-info )
-"
-PDEPEND="
-	x11-misc/xdg-utils
-	handbook? ( kde-apps/khelpcenter:* )
-	policykit? ( kde-plasma/polkit-kde-agent )
-"
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
-	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
-	"${FILESDIR}/${PN}-4.9.3-werror.patch"
-	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
-	"${FILESDIR}/${PN}-4.14.20-FindQt4.patch"
-	"${FILESDIR}/${PN}-4.14.22-webkit.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if use aqua; then
-		sed -i -e \
-			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-		#if [[ ${CHOST} == *-darwin8 ]]; then
-		sed -i -e \
-			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-		#fi
-
-		# solid/solid/backends/iokit doesn't properly link, so disable it.
-		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-			|| die "disabling solid/solid/backends/iokit failed"
-		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-			|| die "disabling solid/solid/backends/iokit failed"
-
-		# There's no fdatasync on OSX and the check fails to detect that.
-		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-			|| die "disabling fdatasync failed"
-
-		# Fix nameser include to nameser8_compat
-		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-			|| die "fixing nameser include failed"
-		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-		# Try to fix kkeyserver_mac
-		eapply "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DWITH_Soprano=OFF
-		-DWITH_SharedDesktopOntologies=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
-		-DBUILD_doc=$(usex handbook)
-		-DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DHAVE_PPC_ALTIVEC=$(usex altivec)
-		-DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx)
-		-DHAVE_X86_SSE=$(usex cpu_flags_x86_sse)
-		-DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2)
-		-DWITH_ACL=$(usex acl)
-		-DWITH_BZip2=$(usex bzip2)
-		-DWITH_QCA2=$(usex crypt)
-		-DWITH_FAM=$(usex fam)
-		-DWITH_Jasper=$(usex jpeg2k)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_LibLZMA=$(usex lzma)
-		-DWITH_Libintl=$(usex nls)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_OpenGL=$(usex opengl)
-		-DWITH_PolkitQt-1=$(usex policykit)
-		-DWITH_ENCHANT=$(usex spell)
-		-DWITH_OpenSSL=$(usex ssl)
-		-DWITH_UDev=$(usex udev)
-		-DWITH_SOLID_UDISKS2=$(usex udisks)
-		-DWITH_KDEWEBKIT=$(usex webkit)
-		-DWITH_Avahi=$(usex zeroconf)
-	)
-
-	use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF )
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-		install_name_tool -id \
-			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-		einfo "fixing ${PN} cmake detection files"
-		#sed -i -e \
-		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in applications make sure that the avahi daemon"
-		elog "is running."
-		echo
-		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		einfo "to include 'mdns', e.g.:"
-		einfo "	hosts: files mdns dns"
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.34.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.34.0.ebuild
index 207edb34382d..f3c32a90ce5b 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.34.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.34.0.ebuild
@@ -16,3 +16,12 @@ RDEPEND="
 	$(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}"
+
+src_test() {
+	# bug 623938 - needs internet connection
+	local myctestargs=(
+		-E "(convertertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.36.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.36.0.ebuild
index 6858c43fe646..30d1f4f2856c 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.36.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.36.0.ebuild
@@ -17,8 +17,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-src_prepare(){
-	kde5_src_prepare
+src_test() {
 	# bug 623938 - needs internet connection
-	sed -i -e "/convertertest\.cpp/d" autotests/CMakeLists.txt || die
+	local myctestargs=(
+		-E "(convertertest)"
+	)
+
+	kde5_src_test
 }
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index a2e5110f5858..9de1fc9d6f58 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,5 +2,5 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
 DIST postfix-3.1.2.tar.gz 4337569 SHA256 1ab9b4ee6bf9eb37d2467a63244132aab22ac23b91a72f327334e236b0d30f6b SHA512 58493d1890c3235d74a18365294ca764bd3b3f278b9825da931005165af60250342c6cf477c3b3575e50858d99cd3ee40f22bece094eb61e9be6c3cf0313d571 WHIRLPOOL 37e90ef6275a7f2dc8f712bb05348861098697438f274a5c5b69f50b31d55574af262a658657863c93f77fdeba2d37bf7b30dc43bf1629615f496ede19a89c00
 DIST postfix-3.1.6.tar.gz 4341308 SHA256 e5eb005fd133c6a32ca03e796e0192945eb877be8eb727f30d25547c997c5aa6 SHA512 646317393d33fcec99bef7f3dc142a847591927bc034c0c71e578baedad1875040cfeabdaa3436312f60485cb69bbdb31197aa9e7526a457946d7749b781099b WHIRLPOOL 66a087da3b33353a22176b9162fe0679f8ff35e48ae693a3315d52232e662638d48b8827648c0b0368e018161e1ade6a671773c109208ded9659cca26b1b5ea1
 DIST postfix-3.2.2.tar.gz 4390318 SHA256 d06849418d119d09366997b2b481bb23f737629769b4e4a52da42fb3ad8b0576 SHA512 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418 WHIRLPOOL 7681299ffb747316f1366350f5fac5cf5f156ed9681a26ec6ed5dca0ab42a6a95f93e943bd6ccaccac259c2f7dd1cd1ba441a8968a8988d59ac2208fdbb2f480
-DIST postfix-3.3-20170716.tar.gz 4392228 SHA256 92f8550650bbe89b37c134fd8e56e107c02763d9ecbf9f906368e643859824bb SHA512 b08afd8708bf10385b898399bb600f8c6a17a985fa407bc2860301d034178b427e9193fb364437042160624ff29979b479c4b9d57b14dc86a23dab8b5d8d2aa7 WHIRLPOOL 89a2af47d4d33a0d6742f3ebc78aa8350d35729627e25874255f7d6ce958928941ec4e77ed2271a5056d6128197aff23b503733fa6d3d5b6d2cdbef83a12360c
+DIST postfix-3.3-20170722.tar.gz 4392460 SHA256 deea661b5158094f988486fa7c248b31ed6792de291a90856c0bec54cb84187d SHA512 d4698c4b5a22915e729380adc47514448791b83d6e67d038b761fe1330c6f28cd6a054980a62e7c5d1351f2bee0aff49b15e85569d710dda355cc7439c905579 WHIRLPOOL 14e05c3ce0de4f6de8c705d9305b72293531955c75389633cb37ee39636afc92d0d0ef6608dc55780c05e83de37e24865a4e7b10eedfa75034bb253c05cc628d
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 0842375bdc4b..6e056425f72c 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -12,9 +12,9 @@
 		<flag name="ldap-bind">Add support for binding to LDAP backend
 			using <pkg>dev-libs/cyrus-sasl</pkg></flag>
 		<flag name="memcached">Add support for using <pkg>net-misc/memcached</pkg>
-		    for lookup tables</flag>
+			for lookup tables</flag>
 		<flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg>
-		    for lookup tables</flag>
+			for lookup tables</flag>
 		<flag name="vda">Add support for virtual delivery agent quota
 			enforcing</flag>
 	</use>
diff --git a/mail-mta/postfix/postfix-3.3_pre20170716.ebuild b/mail-mta/postfix/postfix-3.3_pre20170722.ebuild
similarity index 99%
rename from mail-mta/postfix/postfix-3.3_pre20170716.ebuild
rename to mail-mta/postfix/postfix-3.3_pre20170722.ebuild
index 5e3c5dc6a168..a6ac5530fbf4 100644
--- a/mail-mta/postfix/postfix-3.3_pre20170716.ebuild
+++ b/mail-mta/postfix/postfix-3.3_pre20170722.ebuild
@@ -220,7 +220,7 @@ src_install () {
 	dobin auxiliary/rmail/rmail
 
 	# Provide another link for legacy FSH
-	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
 
 	# Install qshape, posttls-finger and collate
 	dobin auxiliary/qshape/qshape.pl
diff --git a/media-fonts/terminus-font/terminus-font-4.40.ebuild b/media-fonts/terminus-font/terminus-font-4.40.ebuild
index 4ebcc342f10d..1dce78e984f6 100644
--- a/media-fonts/terminus-font/terminus-font-4.40.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.40.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	raw-font-data ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 32ab00531447..aa539541f86d 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,3 +2,4 @@ DIST assimp--3.0.1270-source-only.zip 4042147 SHA256 ac29beb596db97df57451a5503a
 DIST assimp-3.1.1.zip 32869052 SHA256 3b8d16eaf6c4b26479295f4f7436388bee1e42e8c0b11f6f695b7194985eb00e SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527 WHIRLPOOL 238a79a7e2c7ce799dc89394043962456af06eb8b6ed105893512cb751919287c70c88030b03832ba2f3e6ea54d82db4e8d6009629bb7ed3f3e5e6df78bbd6c6
 DIST assimp-3.2.tar.gz 33756081 SHA256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a WHIRLPOOL 1a1cb97356a888863f1183a6cc838cccabda1ffa5d89265f94fb231df24be2cadffbdeb72763826000b80d513e2003d81aca6d20aae7bce09428194ef45f6888
 DIST assimp-3.3.1.tar.gz 36428380 SHA256 d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a WHIRLPOOL 9aba3cc73641ae130c0d3522b32c1bd5afd16eb9b599c1dff8cc1bcb71952b109420eeb7bc3474fc21bbedf79ed58e14743983d6bee01c4e3e5305d447bb9316
+DIST assimp-4.0.0.tar.gz 44618473 SHA256 9025d7fdd2a1d1d23261cbbcb1155b267f2a277f7e86103e5e16f1cdea407fb9 SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62 WHIRLPOOL 4082275dce5244433f501be420ba59a62ba562269daafd985d0bf0e9be013da57ae9390ba2df210b8765612b873078703b6d6bd1884066c2375004fd13c7cbcf
diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.0.ebuild
new file mode 100644
index 000000000000..c96cc0c16511
--- /dev/null
+++ b/media-libs/assimp/assimp-4.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator multilib
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/boost
+	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/findassimp-${PV}.patch"
+	eapply_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DASSIMP_BUILD_SAMPLES=$(usex samples) \
+		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \
+		-DASSIMP_BUILD_STATIC_LIB=$(usex static) \
+		-DASSIMP_BUILD_TESTS=$(usex test)
+		-DCMAKE_DEBUG_POSTFIX=""
+		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/cmake/Modules
+	doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+	"${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch b/media-libs/assimp/files/findassimp-4.0.0.patch
new file mode 100644
index 000000000000..2fbaa73a8500
--- /dev/null
+++ b/media-libs/assimp/files/findassimp-4.0.0.patch
@@ -0,0 +1,25 @@
+--- a/cmake-modules/Findassimp.cmake	2017-07-24 08:21:12.436647541 +0200
++++ b/cmake-modules/Findassimp.cmake	2017-07-24 08:21:30.139980768 +0200
+@@ -55,13 +55,13 @@
+ 	find_path(
+ 	  assimp_INCLUDE_DIRS
+ 	  NAMES postprocess.h scene.h version.h config.h cimport.h
+-	  PATHS /usr/local/include/
++	  PATHS /usr/include/
+ 	)
+ 
+ 	find_library(
+ 	  assimp_LIBRARIES
+ 	  NAMES assimp
+-	  PATHS /usr/local/lib/
++	  PATHS /usr/lib/
+ 	)
+ 
+ 	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+@@ -78,4 +78,4 @@
+ 	  endif (assimp_FIND_REQUIRED)
+ 	endif (assimp_FOUND)
+ 	
+-endif(WIN32)
+\ Brak znaku nowej linii na końcu pliku
++endif(WIN32)
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 581e6bb9ce11..14a640f5754d 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,2 +1,3 @@
 DIST faac-1.28.tar.gz 678891 SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b WHIRLPOOL fe56f3c2b40670f03e0c1880b253d7f0cc6e318c0b407f4e57fb7eaeac8692c6de9829402e670ddc0f397396935131ade0f8dadfc89b88fcdedecbf404e1b54e
 DIST faac-1.29.2.tar.gz 228886 SHA256 c7c46b2b98e99e1597233039f7dd3923f2f9aa91d7d84bcac10d73614a369c63 SHA512 ddcb546b24aa3daf1c0cf0b07597924e32bd86badf4409d715880281062cd9559edee55e27eaf138a41f4a4d15925241c3041965cbc100a6a19a8f62633d1599 WHIRLPOOL 6a3c0cf9f385e384e056d2e1db3825cc66a118fd3ba4fff47664e655b928d19b5fb50b414ea6bd7f6202f71aefc8f63de0ca0f4620ec53bce86e2c5c5a3657e7
+DIST faac-1.29.3.tar.gz 224353 SHA256 cef2897843baf366983ad29f471cd1c4dcc95762b86d283a925514bcc5cf5a3f SHA512 8c25d6127c90e37bb6ae4ce72ba4dbdd9c9999b9c76de58bba61c106fa33ed9c545462589a97be4bd5bcbd2849a55b7d0fe3ed494b5d92ffee001bba2a3c7b61 WHIRLPOOL da4f898b8ba94956f71372f553a405042a63bc8295af3df2de7a11eece329bf81371a04e1547cda1658ebbd1fd1ccb8d645b118e36bd48592e6f99dd03492189
diff --git a/media-libs/faac/faac-1.29.3.ebuild b/media-libs/faac/faac-1.29.3.ebuild
new file mode 100644
index 000000000000..cfae56dc4e80
--- /dev/null
+++ b/media-libs/faac/faac-1.29.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# eutils for einstalldocs
+inherit autotools epatch epunt-cxx eutils ltprune multilib-minimal
+
+DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
+HOMEPAGE="http://www.audiocoding.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPEG-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466984
+
+	eautoreconf
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf ${myconf[@]}
+
+	# do not build the frontend for non default abis
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		sed -i -e 's/frontend//' Makefile || die
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc docs/*.html
+	insinto /usr/share/doc/${PF}/pdf
+	doins docs/libfaac.pdf
+}
diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
index 4cc3c4cad21b..f0359af55f1a 100644
--- a/media-libs/fontconfig/fontconfig-2.12.4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
@@ -45,6 +45,7 @@ src_prepare() {
 
 	# Revert gperf-3.1 fix as it breaks compilation
 	eapply -R "${FILESDIR}"/${PN}-2.12.2-gperf31.patch
+	export GPERF=$(type -P true)
 
 	eautoreconf
 }
diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.29.ebuild
index ef6eb9b2eb62..564b5e3dbe17 100644
--- a/media-libs/libpng/libpng-1.6.29.ebuild
+++ b/media-libs/libpng/libpng-1.6.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index c19d9d6689eb..278ef38e5a68 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,3 @@
 DIST mpg123-1.24.0.tar.bz2 912049 SHA256 55fb169a7711938f5df0497d1ffe28419fbef50011dc01d00b216379e6a2256c SHA512 e7c0d7a103daf496e75a6aa6aca861cfc0ad391f242335990c2360305e567039d24ca3b37a35f79b75749055e255f4692b8b43d2fec332b119223b00e12b0cb7 WHIRLPOOL 3d1c882c4c2c0cf8fc575be3a65f9c9d61a1549f75abeb983c2bafef3c303507bdc494594060bc732096c3d7fb96c372d2554a698a46a19c1c6e5f48e5e61771
-DIST mpg123-1.25.1.tar.bz2 917500 SHA256 0fe7270a4071367f97a7c1fb45fb2ef3cfef73509c205124e080ea569217b05f SHA512 5857fc91baf913e3116a808657d2246cf7662944a991652e53130b70464d821469c72574dff4d227c600276c0ec7e83990bdb99b6ce0144d167cc666f0a70789 WHIRLPOOL 79a6bd6c84f4d7c2485ad10bb47ac75302acbbca7da0724aee15626f0f539e07aa8bc101508951f1e44241b035d70218193fa2c6ebafa46760224afca70d5e65
 DIST mpg123-1.25.2.tar.bz2 918024 SHA256 5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38 SHA512 1b063a7a497d6f643b43a0e0db0e1a8951bf110cabf8f3dc63d7ed1b8e47ef4a42649622a5e4efb582479beacd7d3872b4f061716a5f6970b3f5bed7ef4f3fe9 WHIRLPOOL e8d6e74b857cac86e77651339d3491088ac5024aae149bbcc691a28bb8cda46395ab8f4505d2ff7eb6ba3311c97db1baa64c686ed508adb0ba3c91cd2faf1e32
+DIST mpg123-1.25.3.tar.bz2 917879 SHA256 c24848dd1fcaf6900a2b1f5549996904f75fe6e05de982da655f8c626b375644 SHA512 a2e4368db3b6726b94fc8b1f8aa1210fda2ba1456503cca73b0d9315894d3b72645ebac11dba6717540110bf680fe2f00727da5b0087b6d797fe288bb3c1e65e WHIRLPOOL 74412cc9e70464ebf0b000b6cb66eefe35d45b23fd6d8db1462947ad6f6242578f3360c46a7891245424c24c45bacd09db5341744b306a8f1f9dba6b37db14e6
diff --git a/media-sound/mpg123/mpg123-1.25.1.ebuild b/media-sound/mpg123/mpg123-1.25.3.ebuild
similarity index 100%
rename from media-sound/mpg123/mpg123-1.25.1.ebuild
rename to media-sound/mpg123/mpg123-1.25.3.ebuild
diff --git a/media-sound/podracer/podracer-1.4-r1.ebuild b/media-sound/podracer/podracer-1.4-r2.ebuild
similarity index 64%
rename from media-sound/podracer/podracer-1.4-r1.ebuild
rename to media-sound/podracer/podracer-1.4-r2.ebuild
index ef770550f2c5..13ff3b40a5e5 100644
--- a/media-sound/podracer/podracer-1.4-r1.ebuild
+++ b/media-sound/podracer/podracer-1.4-r2.ebuild
@@ -13,19 +13,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="
-	app-shells/bash
-	net-misc/curl
-"
+RDEPEND="app-shells/bash
+	net-misc/curl"
+
+src_unpack() {
+	default
+
+	# Bug 619956. Change directories first to ensure that "unpack" outputs
+	# to ${S} and not to ${WORKDIR}.
+	cd "${S}" || die
+	unpack "${S}/podracer.1.gz"
+}
 
 src_install() {
 	dobin podracer
 	sed -i -e "s:sample=/usr/share/doc/\$progname/sample.subscriptions:sample=/usr/share/doc/${PF}/sample.subscriptions:" "${D}"/usr/bin/podracer || die
 	dodoc CREDITS README ChangeLog TODO
-	doman podracer.1.gz
-	docompress -x /usr/share/doc/${PF}/sample.subscriptions
-	insinto /usr/share/doc/${PF}
-	doins sample.subscriptions
+	doman podracer.1
+	docompress -x "/usr/share/doc/${PF}/sample.subscriptions"
+	dodoc sample.subscriptions
 	insinto /etc/
 	doins podracer.conf
 }
diff --git a/media-tv/mythtv/mythtv-0.28.1-r1.ebuild b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
new file mode 100644
index 000000000000..ac83e415065f
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.28.1-r1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
+BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
+MY_P=${P%_p*}
+MY_PV=${PV%_p*}
+
+inherit flag-o-matic multilib eutils python-single-r1 qmake-utils user systemd vcs-snapshot
+
+MYTHTV_BRANCH="fixes/0.28"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="https://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
+ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora \
+vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluray? ( xml )
+	theora? ( vorbis )"
+
+COMMON="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[mysql]
+	dev-qt/qtopengl:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/freetype:2
+	media-libs/taglib
+	>=media-sound/lame-3.93.1
+	sys-libs/zlib
+	virtual/mysql
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-misc/wmctrl
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	bluray? (
+		dev-libs/libcdio:=
+		media-libs/libbluray:=
+		sys-fs/udisks:2
+	)
+	cec? ( dev-libs/libcec )
+	dvb? (
+		media-libs/libdvb
+		virtual/linuxtv-dvb-headers
+	)
+	dvd? (
+		dev-libs/libcdio:=
+		sys-fs/udisks:2
+	)
+	egl? ( media-libs/mesa[egl] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hls? (
+		media-libs/faac
+		<media-libs/libvpx-1.7.0:=
+		>=media-libs/x264-0.0.20111220:=
+	)
+	ieee1394? (
+		>=media-libs/libiec61883-1.0.0
+		>=sys-libs/libavc1394-0.5.3
+		>=sys-libs/libraw1394-1.2.0
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		>=dev-perl/libwww-perl-5
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-UPnP
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/lxml
+		dev-python/mysql-python
+		dev-python/urlgrabber
+	)
+	systemd? ( sys-apps/systemd:= )
+	theora? ( media-libs/libtheora media-libs/libogg )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	zeroconf? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${COMMON}
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-apps/xset
+		x11-wm/evilwm
+	)
+	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+"
+DEPEND="${COMMON}
+	dev-lang/yasm
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+"
+
+S="${WORKDIR}/${P}/mythtv"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"v${MY_PV}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	myconf="${myconf} --enable-libmp3lame"
+	use cec || myconf="${myconf} --disable-libcec"
+	use zeroconf || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
+
+	myconf="${myconf} $(use_enable libass)"
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=${EPYTHON}"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		#myconf="${myconf} --disable-stripping" does nothing per sphery
+	fi
+
+	# Video
+	myconf="${myconf} $(use_enable vdpau)"
+	myconf="${myconf} $(use_enable vaapi)"
+	myconf="${myconf} $(use_enable crystalhd)"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	myconf="${myconf} $(use_enable systemd systemd_notify)"
+	use systemd || myconf="${myconf} $(use_enable mythlogserver)"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--qmake=$(qt5_get_bindir)/qmake \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc AUTHORS UPGRADING README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968)
+	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
+	# Ensure we don't install scripts needing the python bindings (bug #516968)
+	use python || find contrib/ -name '*.py' -exec rm -f {} \;
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	elog "To have this machine operate as recording host for MythTV, "
+	elog "mythbackend must be running. Run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	elog "Your recordings folder must be owned 'mythtv'. e.g."
+	elog "chown -R mythtv /var/lib/mythtv"
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	elog
+	elog "Note that the systemd unit now restarts by default and logs"
+	elog "to journald via the console at the notice verbosity."
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 938c3a8041c0..98d7c7ba8aa0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Jul 2017 20:39:28 +0000
+Tue, 25 Jul 2017 05:09:08 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 938c3a8041c0..98d7c7ba8aa0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Jul 2017 20:39:28 +0000
+Tue, 25 Jul 2017 05:09:08 +0000
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.7-r1 b/metadata/md5-cache/app-admin/puppet-3.8.7-r1
index 04305c184508..80893e330017 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.7-r1
+++ b/metadata/md5-cache/app-admin/puppet-3.8.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.7.tar.gz
 _eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=3874be48efba26d374604c8ef1b1201e
+_md5_=19edff0f20544c22b84eac8906a195ad
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.1 b/metadata/md5-cache/app-admin/puppet-4.10.1
index 6c0a7dc44c0a..925a1d3d99fa 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.1
+++ b/metadata/md5-cache/app-admin/puppet-4.10.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.1.tar.gz
 _eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=5a9b3878344cc807ee664693a1fb16a5
+_md5_=f45f5a28e449059ebaea4b0a69aa2168
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.4 b/metadata/md5-cache/app-admin/puppet-4.10.4
index 7d45cbca661a..86cdf428187a 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.4
+++ b/metadata/md5-cache/app-admin/puppet-4.10.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=1656c775bfe9c1140dbadb155a3cebdf
+_md5_=7883359baba0c9ea429e27e37d066baf
diff --git a/metadata/md5-cache/app-admin/puppet-4.8.1 b/metadata/md5-cache/app-admin/puppet-4.8.1
index 1f1a5eb14508..9ff8a8e6cc66 100644
--- a/metadata/md5-cache/app-admin/puppet-4.8.1
+++ b/metadata/md5-cache/app-admin/puppet-4.8.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.8.1.tar.gz
 _eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=eeeddd296f71b3b2abe2f8d83f78ec4d
+_md5_=8aea2e58c66ad0eb19bd9eef842f02c5
diff --git a/metadata/md5-cache/app-admin/puppet-4.9.1-r2 b/metadata/md5-cache/app-admin/puppet-4.9.1-r2
index b0f91d02317c..1affac4b5d4f 100644
--- a/metadata/md5-cache/app-admin/puppet-4.9.1-r2
+++ b/metadata/md5-cache/app-admin/puppet-4.9.1-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.9.1.tar.gz
 _eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=bd68c5e0abbfad7d5bff134ed380c2e8
+_md5_=3341216da6efcdf0565206c695af341f
diff --git a/metadata/md5-cache/app-admin/puppet-5.0.0 b/metadata/md5-cache/app-admin/puppet-5.0.0
index 4b281caac7be..019abe770242 100644
--- a/metadata/md5-cache/app-admin/puppet-5.0.0
+++ b/metadata/md5-cache/app-admin/puppet-5.0.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.0.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e2a44b330e37ae5a027e32f95a9c5bb2
+_md5_=f22e7039c9a3e1eab546210dfa716e05
diff --git a/metadata/md5-cache/app-cdr/burncdda-1.8.3 b/metadata/md5-cache/app-cdr/burncdda-1.8.3
new file mode 100644
index 000000000000..01db8ace5116
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/burncdda-1.8.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Console app for copying burning audio cds
+EAPI=6
+HOMEPAGE=http://www.thenktor.homepage.t-online.de/burncdda
+IUSE=flac mp3 vorbis
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-cdr/cdrdao dev-util/dialog media-sound/normalize media-sound/sox virtual/cdrtools flac? ( media-libs/flac ) mp3? ( media-sound/mpg123 media-sound/mp3_check ) vorbis? ( media-sound/vorbis-tools )
+SLOT=0
+SRC_URI=mirror://sourceforge/burncdda/burncdda-1.8.3.tar.gz
+_md5_=e04c78de2c2094bda6dc63ce31d290d5
diff --git a/metadata/md5-cache/app-crypt/keybase-1.0.21 b/metadata/md5-cache/app-crypt/keybase-1.0.21
new file mode 100644
index 000000000000..c16fae44bb08
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keybase-1.0.21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=dev-lang/go-1.6:0
+DESCRIPTION=Client for keybase.io
+EAPI=6
+HOMEPAGE=https://keybase.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg
+SLOT=0
+SRC_URI=https://github.com/keybase/client/archive/v1.0.21.tar.gz -> keybase-1.0.21.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=82038d9391955b525fee5b626bcc9c3a
diff --git a/metadata/md5-cache/app-crypt/keybase-9999 b/metadata/md5-cache/app-crypt/keybase-9999
new file mode 100644
index 000000000000..96eba8fa479b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keybase-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=dev-lang/go-1.6:0 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Client for keybase.io
+EAPI=6
+HOMEPAGE=https://keybase.io/
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg
+SLOT=0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7087c9fafa1da0a5b7526290e42dc253
diff --git a/metadata/md5-cache/app-crypt/pgpdump-0.32 b/metadata/md5-cache/app-crypt/pgpdump-0.32
new file mode 100644
index 000000000000..47d0444606b4
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/pgpdump-0.32
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/zlib app-arch/bzip2
+DESCRIPTION=A PGP packet visualizer
+EAPI=6
+HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/zlib app-arch/bzip2
+SLOT=0
+SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.32.tar.gz
+_md5_=6c484f1e2e0ef71132b7589e27621759
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.7.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.7.0
new file mode 100644
index 000000000000..70b44be2a561
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Golden Disk Image builder.
+EAPI=6
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.7.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=9506a69a1e421e9c9c24d12eadb599dd
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.5.1 b/metadata/md5-cache/app-emulation/docker-registry-2.5.1
deleted file mode 100644
index e9c5196c3e8f..000000000000
--- a/metadata/md5-cache/app-emulation/docker-registry-2.5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=dev-lang/go-1.5 >=dev-lang/go-1.8 virtual/pkgconfig
-DESCRIPTION=Docker Registry 2.0
-EAPI=6
-HOMEPAGE=https://github.com/docker/distribution
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/docker/distribution/archive/v2.5.1.tar.gz -> docker-registry-2.5.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	7fb5d554a7e656be19ec465fa5bb66db	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=0ee418acbf9297ecd31fea086faa7088
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.6.0 b/metadata/md5-cache/app-emulation/docker-registry-2.6.0
deleted file mode 100644
index 1232fb57ce28..000000000000
--- a/metadata/md5-cache/app-emulation/docker-registry-2.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=dev-lang/go-1.5 >=dev-lang/go-1.8 virtual/pkgconfig
-DESCRIPTION=Docker Registry 2.0
-EAPI=6
-HOMEPAGE=https://github.com/docker/distribution
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/docker/distribution/archive/v2.6.0.tar.gz -> docker-registry-2.6.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	7fb5d554a7e656be19ec465fa5bb66db	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=398b99e03a03c88c47fec73b15aee526
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.6.1 b/metadata/md5-cache/app-emulation/docker-registry-2.6.1
deleted file mode 100644
index 14fb90fcabed..000000000000
--- a/metadata/md5-cache/app-emulation/docker-registry-2.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
-DESCRIPTION=Docker Registry 2.0
-EAPI=6
-HOMEPAGE=https://github.com/docker/distribution
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/docker/distribution/archive/v2.6.1.tar.gz -> docker-registry-2.6.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	7fb5d554a7e656be19ec465fa5bb66db	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=fc8b106c697f043056bd125adb471022
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.6.1-r1 b/metadata/md5-cache/app-emulation/docker-registry-2.6.2
similarity index 77%
rename from metadata/md5-cache/app-emulation/docker-registry-2.6.1-r1
rename to metadata/md5-cache/app-emulation/docker-registry-2.6.2
index 3838f98a4d40..c14774dd4a8d 100644
--- a/metadata/md5-cache/app-emulation/docker-registry-2.6.1-r1
+++ b/metadata/md5-cache/app-emulation/docker-registry-2.6.2
@@ -6,6 +6,6 @@ HOMEPAGE=https://github.com/docker/distribution
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=https://github.com/docker/distribution/archive/v2.6.1.tar.gz -> docker-registry-2.6.1.tar.gz
+SRC_URI=https://github.com/docker/distribution/archive/v2.6.2.tar.gz -> docker-registry-2.6.2.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	7fb5d554a7e656be19ec465fa5bb66db	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=7aea9941bfd2b7f44beed37c4176fab2
+_md5_=9b41233df88dcd19f1e26c79bde1bbde
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.15 b/metadata/md5-cache/app-emulation/virt-what-1.15
new file mode 100644
index 000000000000..388c7ae49698
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virt-what-1.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DEPEND=dev-lang/perl
+DESCRIPTION=Detects if the current machine is running in a virtual machine
+EAPI=6
+HOMEPAGE=https://people.redhat.com/~rjones/virt-what/
+IUSE=dmi
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-shells/bash dmi? ( sys-apps/dmidecode )
+SLOT=0
+SRC_URI=https://people.redhat.com/~rjones/virt-what/files/virt-what-1.15.tar.gz
+_md5_=749e08d7200215dea6fe8985b8f39a1a
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2
new file mode 100644
index 000000000000..15b5e75cfa2b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( 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/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[abi_x86_32(-)?,abi_x86_64(-)?,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/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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-meta: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(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,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-sound/mpg123-1.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] virtual/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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,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-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( 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(-)?] ) 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(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=http://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 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=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( 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/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[abi_x86_32(-)?,abi_x86_64(-)?,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/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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-meta: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(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,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-sound/mpg123-1.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] virtual/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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,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-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( 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(-)?] ) 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(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.6.4 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
+RESTRICT=test
+SLOT=2.0.2
+SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz https://github.com/NP-Hardass/wine-desktop-common/archive/20150204.tar.gz -> wine-desktop-common-20150204.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=cb7b6ad595d89c0ce938a2c47b4b6e2c
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.13 b/metadata/md5-cache/app-emulation/wine-vanilla-2.13
new file mode 100644
index 000000000000..7eee5799523f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( 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/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/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/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,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/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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-meta: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(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,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-sound/mpg123-1.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] virtual/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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,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-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( 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(-)?] ) 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(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=http://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW abi_x86_32 abi_x86_64 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=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( 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/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/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/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,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/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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-meta: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(-)?] ) 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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,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-sound/mpg123-1.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,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? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] virtual/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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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-sound/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(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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(-)?] ) truetype? ( >=media-libs/freetype-2.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,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-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( 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(-)?] ) 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(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,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-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 )
+RESTRICT=test
+SLOT=2.13
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.13.tar.xz https://github.com/NP-Hardass/wine-desktop-common/archive/20150204.tar.gz -> wine-desktop-common-20150204.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=5a725a6567b0e803dc5a46b4809a4ea5
diff --git a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3 b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
index 1f7ea319cc2d..f87298386d82 100644
--- a/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
+++ b/metadata/md5-cache/app-i18n/canna-3.7_p3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A client-server based Kana-Kanji conversion system
 EAPI=6
 HOMEPAGE=http://canna.osdn.jp/
 IUSE=canuum doc ipv6
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=MIT GPL-2
 RDEPEND=canuum? ( dev-libs/libspt sys-libs/ncurses:= )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/canna/9565/Canna37p3.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	cannadic	6d8054590c0aef2c11c567e1a815c052	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=55202223d889711ccfcbee2d53fe953b
+_md5_=4951ef41aa94e3e9ef4c4f158d288f87
diff --git a/metadata/md5-cache/app-misc/plod-1.9-r2 b/metadata/md5-cache/app-misc/plod-1.9-r2
new file mode 100644
index 000000000000..b0143a4621a7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/plod-1.9-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/perl
+DESCRIPTION=A tool to help administrators keep track of daily activities
+EAPI=6
+HOMEPAGE=http://www.deer-run.com/~hal/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-2 )
+SLOT=0
+SRC_URI=http://www.far2wise.net/plod/plod-1.9.tar.gz
+_md5_=31e47daf791df09f45a54c3dfcd86f40
diff --git a/metadata/md5-cache/app-shells/tcsh-6.20.00 b/metadata/md5-cache/app-shells/tcsh-6.20.00
index 7db9ec0ea379..7340e8d7568f 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.20.00
+++ b/metadata/md5-cache/app-shells/tcsh-6.20.00
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.1:0= virtual/libiconv
 RESTRICT=test
 SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.20.00.tar.gz https://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
+SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.20.00.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=ff127752493b6f4070552065bb8ff31f
+_md5_=0e0e7aba1940218d9af59cbae4cc3aef
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.4 b/metadata/md5-cache/app-text/xapian-omega-1.4.4
index 54b688d742a2..1ebeba79ee1c 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.4
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.4
@@ -3,9 +3,9 @@ DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
-KEYWORDS=alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.4/xapian-omega-1.4.4.tar.xz
-_md5_=a0f8016b902a8ce8d54dd4ad4c403f16
+_md5_=e2a9bf516b05c164b27f2a7cb46868fb
diff --git a/metadata/md5-cache/app-vim/nagios-syntax-1.8 b/metadata/md5-cache/app-vim/nagios-syntax-1.8
new file mode 100644
index 000000000000..6b352dea5f62
--- /dev/null
+++ b/metadata/md5-cache/app-vim/nagios-syntax-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Nagios configuration files syntax
+EAPI=6
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2261
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~monsieurp/packages/nagios-syntax-1.8.tar.gz
+_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_md5_=c8baecec92f9ec7e34a685a4b40b3e9a
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2
new file mode 100644
index 000000000000..72c4bc9791b4
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Gentoo MySQL init scripts.
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2
+SLOT=0
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	s6	9fd5ce6a54658cb380091f4c3acc544e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=0c29944aff33cfb3be3e62a57f4084d7
diff --git a/metadata/md5-cache/dev-java/icedtea-3.4.0 b/metadata/md5-cache/dev-java/icedtea-3.5.0
similarity index 76%
rename from metadata/md5-cache/dev-java/icedtea-3.4.0
rename to metadata/md5-cache/dev-java/icedtea-3.5.0
index 723b98945824..ac707b6c182e 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.4.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.5.0
@@ -10,6 +10,6 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced
 RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=media-libs/lcms-2.5:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
 REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=8
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.4.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/openjdk.tar.xz -> icedtea-3.4-openjdk-ed5ee0ac7111.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/corba.tar.xz -> icedtea-3.4-corba-22ed32f45405.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/jaxp.tar.xz -> icedtea-3.4-jaxp-fdc2a6442d2f.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/jaxws.tar.xz -> icedtea-3.4-jaxws-c1bfc2395c57.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/jdk.tar.xz -> icedtea-3.4-jdk-cfc292a2c1c6.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/hotspot.tar.xz -> icedtea-3.4-hotspot-00b7bbd261c9.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/nashorn.tar.xz -> icedtea-3.4-nashorn-f2d9bca28d0e.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/langtools.tar.xz -> icedtea-3.4-langtools-4ef0ee927940.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/shenandoah.tar.xz -> icedtea-3.4-shenandoah-6ffe8637a506.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.4.0/aarch32.tar.xz -> icedtea-3.4-aarch32-b93c39bf2bcf.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
+SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.5.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/openjdk.tar.xz -> icedtea-3.5-openjdk-ee1282876d8a.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/corba.tar.xz -> icedtea-3.5-corba-e53fedec27e8.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/jaxp.tar.xz -> icedtea-3.5-jaxp-a7fb5fa68e85.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/jaxws.tar.xz -> icedtea-3.5-jaxws-8c2ac8bef689.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/jdk.tar.xz -> icedtea-3.5-jdk-bdf93656feba.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/hotspot.tar.xz -> icedtea-3.5-hotspot-24ab92601b89.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/nashorn.tar.xz -> icedtea-3.5-nashorn-6743b468dda3.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/langtools.tar.xz -> icedtea-3.5-langtools-0456f88e5c29.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/shenandoah.tar.xz -> icedtea-3.5-shenandoah-098a7fa49b3b.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.5.0/aarch32.tar.xz -> icedtea-3.5-aarch32-b93c39bf2bcf.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=695a904a5ebb62f9a24747e6fee19556
+_md5_=d7d442fb2a82ced8ae86b4fdf7b5b871
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.5.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.5.0
new file mode 100644
index 000000000000..d53bf11523e1
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.5.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=6
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 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 ~arm ~ppc64 ~x86
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
+RDEPEND=>=sys-devel/gcc-5.4.0[multilib?] >=sys-libs/glibc-2.23[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42: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.11: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.5: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/lcms-2.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(-)?] >=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(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] ) gtk? ( >=dev-libs/atk-2.16.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.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[abi_x86_32(-)?,abi_x86_64(-)?,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: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/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib: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(-)?] =media-libs/libpng-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/libX11-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/libXcomposite-0.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(-)?] >=x11-libs/libXext-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/libXi-1.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(-)?] >=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/libXtst-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(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
+RESTRICT=preserve-libs strip
+SLOT=8
+SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.5.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.5.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.5.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.5.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.5.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.5.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.5.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.5.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.5.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.5.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.5.0-arm.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.5.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.5.0-x86.tar.xz ) )
+_eclasses_=fdo-mime	21ef5adf81836863efa968f2a25cff64	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	df8265631f8bf5f5df387e9b987121f9	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=d9c78f754f8ce60b00715e1f8d2a1db0
diff --git a/metadata/md5-cache/dev-lang/rust-1.19.0 b/metadata/md5-cache/dev-lang/rust-1.19.0
new file mode 100644
index 000000000000..b1f863eab767
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.19.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm setup unpack
+DEPEND=libcxx? ( sys-libs/libcxx ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/perl-5.0 clang? ( sys-devel/clang )
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=clang debug doc libcxx
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 >=dev-util/cargo-0.20.0
+RDEPEND=libcxx? ( sys-libs/libcxx )
+REQUIRED_USE=libcxx? ( clang )
+SLOT=stable/1.19
+SRC_URI=amd64? ( https://static.rust-lang.org/dist/rustc-1.18.0-x86_64-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/rust-std-1.18.0-x86_64-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( https://static.rust-lang.org/dist/rustc-1.18.0-i686-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/rust-std-1.18.0-i686-unknown-linux-gnu.tar.gz https://static.rust-lang.org/dist/cargo-0.19.0-i686-unknown-linux-gnu.tar.gz ) https://static.rust-lang.org/dist/rustc-1.19.0-src.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bac4ad24e43f575b81b7343e5b05be21
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.19.0 b/metadata/md5-cache/dev-lang/rust-bin-1.19.0
new file mode 100644
index 000000000000..1f6d8f6cac08
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.19.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=5
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 !dev-lang/rust:0
+SLOT=stable
+SRC_URI=amd64? ( http://static.rust-lang.org/dist/rust-1.19.0-x86_64-unknown-linux-gnu.tar.gz ) x86? ( http://static.rust-lang.org/dist/rust-1.19.0-i686-unknown-linux-gnu.tar.gz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=03ab815181e8cb00bf088bf75b83dfaa
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.8-r1 b/metadata/md5-cache/dev-libs/libgdata-0.17.8-r1
new file mode 100644
index 000000000000..8f5f44407a4b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90: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:= ) >=dev-util/gtk-doc-am-1.25 >=dev-util/intltool-0.40 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5 ) vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
+IUSE=+crypt gnome-online-accounts +introspection static-libs test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90: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:= )
+REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
+SLOT=0/22
+SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.8.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	vala	f86cd45e9ae738c40c92f990266f39a7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=c08cd3ecbe872cabdb464a4044ea9526
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.4.2 b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
new file mode 100644
index 000000000000..66044baa473c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170317
+DESCRIPTION=a pipeline manipulation library
+EAPI=5
+HOMEPAGE=http://libpipeline.nongnu.org/
+IUSE=static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.4.2.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=f08c8fd80a3f7376b5e3c9b45e89cc21
diff --git a/metadata/md5-cache/dev-libs/libspt-1.1-r3 b/metadata/md5-cache/dev-libs/libspt-1.1-r3
index 09613a473ea6..c1af0d8260ea 100644
--- a/metadata/md5-cache/dev-libs/libspt-1.1-r3
+++ b/metadata/md5-cache/dev-libs/libspt-1.1-r3
@@ -3,9 +3,9 @@ DESCRIPTION=Library for handling root privilege
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=suid
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=BSD-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/libspt-1.1.tar.bz2
-_md5_=7a6fd523769b4761b95e2b9168f0235f
+_md5_=7f6f182a98b91b3418094030ceab6806
diff --git a/metadata/md5-cache/dev-libs/serd-0.20.0 b/metadata/md5-cache/dev-libs/serd-0.20.0
deleted file mode 100644
index 78b44d7154a2..000000000000
--- a/metadata/md5-cache/dev-libs/serd-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen )
-DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
-EAPI=4
-HOMEPAGE=http://drobilla.net/software/serd/
-IUSE=doc static-libs test
-KEYWORDS=amd64 ~ppc x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://download.drobilla.net/serd-0.20.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=a224ed0f83430d64587d9a2cabadd04c
diff --git a/metadata/md5-cache/dev-libs/serd-0.22.0 b/metadata/md5-cache/dev-libs/serd-0.22.0
deleted file mode 100644
index 11b3ab1a50b9..000000000000
--- a/metadata/md5-cache/dev-libs/serd-0.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen )
-DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
-EAPI=4
-HOMEPAGE=http://drobilla.net/software/serd/
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://download.drobilla.net/serd-0.22.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=fdb35b388f7c31703a6d834bd35a983d
diff --git a/metadata/md5-cache/dev-libs/serd-0.24.0 b/metadata/md5-cache/dev-libs/serd-0.24.0
deleted file mode 100644
index 6e82684d950e..000000000000
--- a/metadata/md5-cache/dev-libs/serd-0.24.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen )
-DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
-EAPI=4
-HOMEPAGE=http://drobilla.net/software/serd/
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://download.drobilla.net/serd-0.24.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=8c66d1fdffca85f8e793efe7d7c46ec4
diff --git a/metadata/md5-cache/dev-libs/serd-0.18.2 b/metadata/md5-cache/dev-libs/serd-0.28.0
similarity index 77%
rename from metadata/md5-cache/dev-libs/serd-0.18.2
rename to metadata/md5-cache/dev-libs/serd-0.28.0
index 9c1a85ad0766..8b0c2e98d784 100644
--- a/metadata/md5-cache/dev-libs/serd-0.18.2
+++ b/metadata/md5-cache/dev-libs/serd-0.28.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen )
+DEPEND=|| ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen )
 DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
 EAPI=4
 HOMEPAGE=http://drobilla.net/software/serd/
@@ -7,6 +7,6 @@ IUSE=doc static-libs test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=ISC
 SLOT=0
-SRC_URI=http://download.drobilla.net/serd-0.18.2.tar.bz2
+SRC_URI=http://download.drobilla.net/serd-0.28.0.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=fdb35b388f7c31703a6d834bd35a983d
+_md5_=f6cc588758d4ae7b3940b4a36b850d48
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.4 b/metadata/md5-cache/dev-libs/xapian-1.4.4
index dd37f2c6cdd7..3f3a84ee12cf 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.4
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 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
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.4/xapian-core-1.4.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=4f769777f9acce1b4e0b4ef42dd0cc4a
+_md5_=c102ded8d181a8d278a5fea8793e9a17
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
index 1958f6ffac86..4d0c2fd210c5 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=java lua mono perl php python ruby tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD java php_targets_php5-6
-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/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) 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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( dev-lang/ruby:= ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) php? ( || ( php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.4/xapian-bindings-1.4.4.tar.xz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=09cd20492bea4de7669197a72cdefd4b
+_md5_=7c2b5e794a5bf6448c7e8c42ca90db89
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.24 b/metadata/md5-cache/dev-libs/xmlsec-1.2.24
index bc2c29891c06..e1ba4f497a5f 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.24
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.24
@@ -4,11 +4,11 @@ DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting
 EAPI=6
 HOMEPAGE=http://www.aleksey.com/xmlsec
 IUSE=doc gcrypt gnutls nss +openssl static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.0.20 gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 ) gnutls? ( >=net-libs/gnutls-2.8.0 ) nss? ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9 ) openssl? ( >=dev-libs/openssl-1.0.0:* )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
 SLOT=0
 SRC_URI=http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.24.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=998872c7229097bcce6b955a9faa54da
+_md5_=4a9503ebbadcb489ad82042e37f06fa8
diff --git a/metadata/md5-cache/dev-ml/angstrom-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-0.6.0
new file mode 100644
index 000000000000..3871f879dfa6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:= dev-ml/ocaml-cstruct:= dev-ml/ocplib-endian:= dev-ml/result:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-cstruct:= dev-ml/ocplib-endian:= dev-ml/result:=
+RESTRICT=test
+SLOT=0/0.6.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_md5_=a4d3e46062552a0c9db35476ca673f9a
diff --git a/metadata/md5-cache/dev-ml/angstrom-async-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-async-0.6.0
new file mode 100644
index 000000000000..ee72f2e236c9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-async-0.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:=
+SLOT=0/0.6.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_md5_=11c86db67f6f5171b0f414d08a5a85ea
diff --git a/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.6.0
new file mode 100644
index 000000000000..fb002fc11d7a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:=
+SLOT=0/0.6.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_md5_=599d9028d0d6f88cb399f284140ed8f3
diff --git a/metadata/md5-cache/dev-ml/angstrom-unix-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-unix-0.6.0
new file mode 100644
index 000000000000..f8d8e9a2dbbd
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-unix-0.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:=
+SLOT=0/0.6.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_md5_=6774f791d56a6d129a957e82821625ad
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta10 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta10
index dd6b22ca4878..c369de54efb6 100644
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta10
+++ b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta10
@@ -4,9 +4,9 @@ DESCRIPTION=A composable build system for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/janestreet/jbuilder
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/ocaml:=
 SLOT=0/1.0_beta10
 SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta10.tar.gz -> jbuilder-1.0-beta10.tar.gz
-_md5_=995c24b7a9029a4a6ab438ab341dd424
+_md5_=55df15654758c0e05f92527d7158626d
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0
index 0c0bd40dfcb2..2ae676b22d23 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-4.0.0:=
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/4.0.0
 SRC_URI=https://releases.llvm.org/4.0.0/llvm-4.0.0.src.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5305cc5ef55871342570bde447799869
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
index b7d947844a8a..02248c6e79da 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-4.0.1:=
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/4.0.1
 SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5305cc5ef55871342570bde447799869
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.9999
new file mode 100644
index 000000000000..019499a8d42b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)]
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=0/5.0.9999
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cda3365a166cca6061febace04bdd0e0
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
index e5648469784a..44cd67926931 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?] !sys-devel/llvm[ocaml(-)]
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/9999
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e6f0c832e388e723e2a9c7e907905942
diff --git a/metadata/md5-cache/dev-ml/lwt-3.1.0 b/metadata/md5-cache/dev-ml/lwt-3.1.0
index 07a871148642..394c6f7c2d65 100644
--- a/metadata/md5-cache/dev-ml/lwt-3.1.0
+++ b/metadata/md5-cache/dev-ml/lwt-3.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Cooperative light-weight thread library for OCaml
 EAPI=5
 HOMEPAGE=http://ocsigen.org/lwt
 IUSE=+camlp4 +libev
-KEYWORDS=~amd64 ~arm64 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~x86-fbsd
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:= dev-ml/result:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= libev? ( dev-libs/libev ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1
 SLOT=0/3.1.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/3.1.0.tar.gz -> lwt-3.1.0.tar.gz
-_md5_=c666440e9c5019b1b0085f1ed3698a73
+_md5_=9621d6e47985c54c5e9c98eab76a46a6
diff --git a/metadata/md5-cache/dev-ml/menhir-20170101 b/metadata/md5-cache/dev-ml/menhir-20170101
deleted file mode 100644
index 9ef656279cd4..000000000000
--- a/metadata/md5-cache/dev-ml/menhir-20170101
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=LR(1) parser generator for the OCaml language
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=QPL-1.0 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
-SLOT=0/20170101
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170101.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=c728dba191ad5b94515b0e898a0e89ab
diff --git a/metadata/md5-cache/dev-ml/menhir-20170418 b/metadata/md5-cache/dev-ml/menhir-20170418
deleted file mode 100644
index 2b529fdfb442..000000000000
--- a/metadata/md5-cache/dev-ml/menhir-20170418
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=LR(1) parser generator for the OCaml language
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
-SLOT=0/20170418
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170418.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=903f985ee1bdc672bc1f7ad9c14bac16
diff --git a/metadata/md5-cache/dev-ml/menhir-20170509 b/metadata/md5-cache/dev-ml/menhir-20170509
deleted file mode 100644
index 9d8f123c5b4b..000000000000
--- a/metadata/md5-cache/dev-ml/menhir-20170509
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=LR(1) parser generator for the OCaml language
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
-SLOT=0/20170509
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170509.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=903f985ee1bdc672bc1f7ad9c14bac16
diff --git a/metadata/md5-cache/dev-ml/menhir-20170607 b/metadata/md5-cache/dev-ml/menhir-20170607
deleted file mode 100644
index 1b41a756dc56..000000000000
--- a/metadata/md5-cache/dev-ml/menhir-20170607
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=LR(1) parser generator for the OCaml language
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
-SLOT=0/20170607
-SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170607.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=e4092ffed78686379e119672cffad834
diff --git a/metadata/md5-cache/dev-ml/menhir-20170712 b/metadata/md5-cache/dev-ml/menhir-20170712
index b26fdca5de03..0e45688ce109 100644
--- a/metadata/md5-cache/dev-ml/menhir-20170712
+++ b/metadata/md5-cache/dev-ml/menhir-20170712
@@ -4,10 +4,10 @@ DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=5
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
 IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
 SLOT=0/20170712
 SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=e4092ffed78686379e119672cffad834
+_md5_=9107d7895b69fb99e36071feaf352336
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-0.7 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-0.7
deleted file mode 100644
index 6e062e54eee0..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/result:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Convert OCaml parsetrees between different major versions
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/ocaml:= dev-ml/result:=
-SLOT=0/0.7
-SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v0.7.tar.gz -> ocaml-migrate-parsetree-0.7.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=4a68c1943aaeefbb809a5392dddd616a
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0
deleted file mode 100644
index 1c418f4942fd..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/result:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Convert OCaml parsetrees between different major versions
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/ocaml:= dev-ml/result:=
-SLOT=0/1.0
-SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.tar.gz -> ocaml-migrate-parsetree-1.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=4a68c1943aaeefbb809a5392dddd616a
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1
index 2c655a897847..78b2556852cf 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/ocaml:= dev-ml/result:= dev-ml/jbuilder dev-ml/opam >=dev-ml/fin
 DESCRIPTION=Convert OCaml parsetrees between different major versions
 EAPI=6
 HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:= dev-ml/result:=
 SLOT=0/1.0.1
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/1.0.1.tar.gz -> ocaml-migrate-parsetree-1.0.1.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=8c0a8c8e856264396d1546bb6f4d1f87
+_md5_=5cdbc5e4d9e0b8181b33140a92d947c4
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
index 0da25a819c8e..35318de822ee 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
+++ b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/findlib-1.0.4-
 DESCRIPTION=Tools for authors of ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:=
 SLOT=0/5.0.1
 SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.0.1.tar.gz -> ppx_tools_versioned-5.0.1.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=4aea96df0fcc39174416a1f5edb874e3
+_md5_=7f3291f361c004ea09a9654d6ddf3000
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0_beta1 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0_beta1
deleted file mode 100644
index 5044092e6226..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0_beta1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/5.0_beta1
-SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.0beta1.tar.gz -> ppx_tools_versioned-5.0beta1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=4aea96df0fcc39174416a1f5edb874e3
diff --git a/metadata/md5-cache/dev-php/PHPMailer-5.2.23 b/metadata/md5-cache/dev-php/PHPMailer-5.2.23-r1
similarity index 80%
rename from metadata/md5-cache/dev-php/PHPMailer-5.2.23
rename to metadata/md5-cache/dev-php/PHPMailer-5.2.23-r1
index f5d2ad8f9097..78562b165728 100644
--- a/metadata/md5-cache/dev-php/PHPMailer-5.2.23
+++ b/metadata/md5-cache/dev-php/PHPMailer-5.2.23-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst
+DEFINED_PHASES=compile install postinst prepare
 DEPEND=dev-lang/php:* doc? ( dev-php/phpDocumentor )
 DESCRIPTION=Full-featured email creation and transfer class for PHP
 EAPI=6
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/PHPMailer/PHPMailer/archive/v5.2.23.tar.gz -> PHPMailer-5.2.23.tar.gz
-_md5_=aefc272288db9930c01f7fdcbc01567c
+_md5_=7c9efdbd8557d4b3f6edb5ee10660173
diff --git a/metadata/md5-cache/dev-python/clang-python-4.0.0 b/metadata/md5-cache/dev-python/clang-python-4.0.0
index 12e8bd706168..916d0b6de8f2 100644
--- a/metadata/md5-cache/dev-python/clang-python-4.0.0
+++ b/metadata/md5-cache/dev-python/clang-python-4.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.0/cfe-4.0.0.src.tar.xz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=42db1fbd0cacb82bf96e89c0b7a53c3f
+_md5_=f76881df3a7b654f79b27a64b5daf1e2
diff --git a/metadata/md5-cache/dev-python/clang-python-4.0.1 b/metadata/md5-cache/dev-python/clang-python-4.0.1
index ae1a730871f8..641bed1d8624 100644
--- a/metadata/md5-cache/dev-python/clang-python-4.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-4.0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/cfe-4.0.1.src.tar.xz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=42db1fbd0cacb82bf96e89c0b7a53c3f
+_md5_=f76881df3a7b654f79b27a64b5daf1e2
diff --git a/metadata/md5-cache/dev-python/clang-python-5.0.9999 b/metadata/md5-cache/dev-python/clang-python-5.0.9999
new file mode 100644
index 000000000000..f3f552001b77
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-5.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install test unpack
+DEPEND=>=sys-devel/clang-5.0.9999 !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang: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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=>=sys-devel/clang-5.0.9999 !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang: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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=git-r3	cbafa3261c37c7e3af44bb16a34ea390	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=6a36f0136525b126a576105d484e3388
diff --git a/metadata/md5-cache/dev-python/clang-python-9999 b/metadata/md5-cache/dev-python/clang-python-9999
index 79e96c0f7847..abbec84852b1 100644
--- a/metadata/md5-cache/dev-python/clang-python-9999
+++ b/metadata/md5-cache/dev-python/clang-python-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-devel/clang-9999 !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=git-r3	cbafa3261c37c7e3af44bb16a34ea390	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=89c224bdb39e9a3206049e3a968cb0ad
+_md5_=26fa2550bb66f27e8fb6dbb0c18d4a6c
diff --git a/metadata/md5-cache/dev-python/jpype-0.6.1 b/metadata/md5-cache/dev-python/jpype-0.6.1
index e1565eb04071..42170e14dbc6 100644
--- a/metadata/md5-cache/dev-python/jpype-0.6.1
+++ b/metadata/md5-cache/dev-python/jpype-0.6.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/originell/jpype/archive/v0.6.1.zip -> jpype-0.6.1.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=f693cf70fa8bc26b3d06f50c1f6fcb86
+_md5_=15cee1683cd3c9362b919b4641331bda
diff --git a/metadata/md5-cache/dev-python/jpype-0.6.2 b/metadata/md5-cache/dev-python/jpype-0.6.2
index 11ccc22d3aac..2ffb8e8a67ee 100644
--- a/metadata/md5-cache/dev-python/jpype-0.6.2
+++ b/metadata/md5-cache/dev-python/jpype-0.6.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/originell/jpype/archive/v0.6.2.zip -> jpype-0.6.2.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=3d9e092493e55b1057907f24325e46b9
+_md5_=b5588d4ea3c9bb763ea1b4f72c193cbc
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-4.9.1 b/metadata/md5-cache/dev-python/keystonemiddleware-4.9.1
index 3679793a0273..b3df283d2c62 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-4.9.1
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-4.9.1
@@ -3,7 +3,7 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3
 DESCRIPTION=A middleware for the OpenStack Keystone API
 EAPI=6
 HOMEPAGE=https://github.com/openstack/keystonemiddleware
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.10.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(-)] >=dev-python/oslo-config-3.14.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(-)] >=dev-python/oslo-context-2.9.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(-)] >=dev-python/oslo-i18n-2.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(-)] >=dev-python/oslo-serialization-1.10.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(-)] >=dev-python/oslo-utils-3.16.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(-)] >=dev-python/positional-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycadf-1.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(-)] !~dev-python/pycadf-2.0.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(-)] >=dev-python/python-keystoneclient-2.0.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(-)] !~dev-python/python-keystoneclient-2.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(-)] >=dev-python/requests-2.10.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(-)] >=dev-python/six-1.9.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(-)] >=dev-python/webob-1.2.3[python_targets_python2_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(-)]
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-4.9.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0b95312df3e308326cc47ec8d0825f57
+_md5_=434b7089c1df0c0480bf7d6554f12d23
diff --git a/metadata/md5-cache/dev-python/lit-5.0.9999 b/metadata/md5-cache/dev-python/lit-5.0.9999
new file mode 100644
index 000000000000..a89b299ea86e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-5.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/llvm ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=UoI-NCSA
+RDEPEND=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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	cbafa3261c37c7e3af44bb16a34ea390	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=c73597fe2dd3db53ca672270aea4a24e
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.19.0 b/metadata/md5-cache/dev-python/llvmlite-0.19.0
index 71bcc7b8f100..5f845bcea848 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.19.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.19.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/llvmlite/llvmlite-0.19.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=8dc69da5d5016fc4891bc5ddde792411
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.3.0 b/metadata/md5-cache/dev-qt/qt-creator-4.3.0
index 6442edbd5e33..154340491389 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.3.0
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.0:5 >=dev-qt/qtcore-5.6.0:5 >=dev-qt/qtdeclarative-5.6.0:5[widgets] >=dev-qt/qtgui-5.6.0:5 >=dev-qt/qthelp-5.6.0:5 >=dev-qt/qtnetwork-5.6.0:5[ssl] >=dev-qt/qtprintsupport-5.6.0:5 >=dev-qt/qtquickcontrols-5.6.0:5 >=dev-qt/qtscript-5.6.0:5 >=dev-qt/qtsql-5.6.0:5[sqlite] >=dev-qt/qtsvg-5.6.0:5 >=dev-qt/qtwidgets-5.6.0:5 >=dev-qt/qtx11extras-5.6.0:5 >=dev-qt/qtxml-5.6.0:5 clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-5.6.0:5 ) qbs? ( >=dev-util/qbs-1.8.0 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.0:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) linguas_cs? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_de? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_fr? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_ja? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_pl? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_ru? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_sl? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_uk? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_zh_CN? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_zh_TW? ( >=dev-qt/qttranslations-5.6.0:5 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.3/4.3.0/qt-creator-opensource-src-4.3.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	2c2e15383ba891d642f51896a7f0ecfe	llvm	45ef89988bfb458ac81bb566c1eaa437	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	2c2e15383ba891d642f51896a7f0ecfe	llvm	2564476f64d2d9b62d757ff42101ff7b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=86d5236fb29ea1e9fec03c3d9f650eaa
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.3.1 b/metadata/md5-cache/dev-qt/qt-creator-4.3.1
index c72d27876e45..96e02fbaacf9 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-4.3.1
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.0:5 >=dev-qt/qtcore-5.6.0:5 >=dev-qt/qtdeclarative-5.6.0:5[widgets] >=dev-qt/qtgui-5.6.0:5 >=dev-qt/qthelp-5.6.0:5 >=dev-qt/qtnetwork-5.6.0:5[ssl] >=dev-qt/qtprintsupport-5.6.0:5 >=dev-qt/qtquickcontrols-5.6.0:5 >=dev-qt/qtscript-5.6.0:5 >=dev-qt/qtsql-5.6.0:5[sqlite] >=dev-qt/qtsvg-5.6.0:5 >=dev-qt/qtwidgets-5.6.0:5 >=dev-qt/qtx11extras-5.6.0:5 >=dev-qt/qtxml-5.6.0:5 clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-5.6.0:5 ) qbs? ( >=dev-util/qbs-1.8.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.0:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) linguas_cs? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_de? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_fr? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_ja? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_pl? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_ru? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_sl? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_uk? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_zh_CN? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_zh_TW? ( >=dev-qt/qttranslations-5.6.0:5 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/4.3/4.3.1/qt-creator-opensource-src-4.3.1.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	2c2e15383ba891d642f51896a7f0ecfe	llvm	45ef89988bfb458ac81bb566c1eaa437	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	2c2e15383ba891d642f51896a7f0ecfe	llvm	2564476f64d2d9b62d757ff42101ff7b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=458d2d079713ec881df41a7118c2a5ad
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index 5b85f60f77ce..e997b0f97294 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -7,5 +7,5 @@ IUSE=doc systemd test +webengine android autotools baremetal bazaar clangcodemod
 LICENSE=GPL-3
 RDEPEND==dev-libs/botan-1.10*[-bindist,threads] >=dev-qt/qtconcurrent-5.6.0:5 >=dev-qt/qtcore-5.6.0:5 >=dev-qt/qtdeclarative-5.6.0:5[widgets] >=dev-qt/qtgui-5.6.0:5 >=dev-qt/qthelp-5.6.0:5 >=dev-qt/qtnetwork-5.6.0:5[ssl] >=dev-qt/qtprintsupport-5.6.0:5 >=dev-qt/qtquickcontrols-5.6.0:5 >=dev-qt/qtscript-5.6.0:5 >=dev-qt/qtsql-5.6.0:5[sqlite] >=dev-qt/qtsvg-5.6.0:5 >=dev-qt/qtwidgets-5.6.0:5 >=dev-qt/qtx11extras-5.6.0:5 >=dev-qt/qtxml-5.6.0:5 clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-5.6.0:5 ) qbs? ( >=dev-util/qbs-1.8.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-5.6.0:5[widgets] ) sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) linguas_cs? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_de? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_fr? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_ja? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_pl? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_ru? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_sl? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_uk? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_zh_CN? ( >=dev-qt/qttranslations-5.6.0:5 ) linguas_zh_TW? ( >=dev-qt/qttranslations-5.6.0:5 )
 SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	cbafa3261c37c7e3af44bb16a34ea390	l10n	2c2e15383ba891d642f51896a7f0ecfe	llvm	45ef89988bfb458ac81bb566c1eaa437	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	cbafa3261c37c7e3af44bb16a34ea390	l10n	2c2e15383ba891d642f51896a7f0ecfe	llvm	2564476f64d2d9b62d757ff42101ff7b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=458d2d079713ec881df41a7118c2a5ad
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.1.2 b/metadata/md5-cache/dev-ruby/actionmailer-5.1.2
index e13871efff82..83baf6c40014 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm64 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby22] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby22] =dev-ruby/mail-2*:*[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] ~dev-ruby/activejob-5.1.2[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0714e86980c88908ef856b77cbb720ce
+_md5_=e9e096425d70a3e649953018e7d6e3be
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.1.2 b/metadata/md5-cache/dev-ruby/actionpack-5.1.2
index b18b557a92a2..a4ac33c8b155 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm64 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby22] dev-ruby/rack:2.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.1.2[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1ae36714e22343077233e4ec4e65688f
+_md5_=89d2bb58020961c017f2a9e10dbfe401
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.1.2 b/metadata/md5-cache/dev-ruby/actionview-5.1.2
index 7bc23066096e..cf69c970f3f5 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.1.2
+++ b/metadata/md5-cache/dev-ruby/actionview-5.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm64 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] >=dev-ruby/builder-3.1:*[ruby_targets_ruby22] =dev-ruby/builder-3*:*[ruby_targets_ruby22] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby22] dev-ruby/rails-dom-testing:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b0af46d60bb0b257c63a2bfb7354f31e
+_md5_=f7d638237ec357aa26360c93c0b78d35
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.1.2 b/metadata/md5-cache/dev-ruby/activemodel-5.1.2
index be0a9daf3706..91f8d72f0e61 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Acti
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm64 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8f1725e8d5e172e00d29294c34363670
+_md5_=66b625e4293ccf28e39401410e63e31c
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.1.2 b/metadata/md5-cache/dev-ruby/activerecord-5.1.2
index 0e8cfbb6eb72..75a0e1430338 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.1.2
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm64 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby22] dev-ruby/arel:8.0[ruby_targets_ruby22] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby22] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby22] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby22] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby23] dev-ruby/arel:8.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.1.2[ruby_targets_ruby24] dev-ruby/arel:8.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d33c0630e13d0330459de9adf3dbfa74
+_md5_=76b887014c65330f449689ffbc443886
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1
new file mode 100644
index 000000000000..d1ae7d274051
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( test? ( dev-util/cucumber[ruby_targets_ruby21] dev-ruby/rspec-expectations:*[ruby_targets_ruby21] dev-ruby/asciimath[ruby_targets_ruby21] dev-ruby/coderay[ruby_targets_ruby21] dev-ruby/erubis[ruby_targets_ruby21] dev-ruby/haml[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/slim[ruby_targets_ruby21] dev-ruby/tilt[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-util/cucumber[ruby_targets_ruby22] dev-ruby/rspec-expectations:*[ruby_targets_ruby22] dev-ruby/asciimath[ruby_targets_ruby22] dev-ruby/coderay[ruby_targets_ruby22] dev-ruby/erubis[ruby_targets_ruby22] dev-ruby/haml[ruby_targets_ruby22] dev-ruby/nokogiri[ruby_targets_ruby22] dev-ruby/slim[ruby_targets_ruby22] dev-ruby/tilt[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec-expectations:*[ruby_targets_ruby23] dev-ruby/asciimath[ruby_targets_ruby23] dev-ruby/coderay[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/haml[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/slim[ruby_targets_ruby23] dev-ruby/tilt[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
+EAPI=6
+HOMEPAGE=https://github.com/asciidoctor/asciidoctor
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.6.1.tar.gz -> asciidoctor-1.5.6.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c71d1ee4dd2cb5000ad7611235732325
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1 b/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1
index ce0e71c88a79..eae509daa0d1 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1
+++ b/metadata/md5-cache/dev-ruby/capybara-2.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Capybara aims to simplify the process of integration testing Rack ap
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
 IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.14.4.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=b7df9e7f81af44779e85d5652c491376
+_md5_=fbecc265fa195d6255185b3fd5dbe189
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2 b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
index f7b8914ebe9b..d09a285aa7c2 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Helper class for launching cross-platform applications
 EAPI=5
 HOMEPAGE=https://github.com/copiousfreetime/launchy
 IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=ISC
 RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby21] !!x11-misc/launchy[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] !!x11-misc/launchy[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/launchy-2.4.3.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0bb12d3f5710380a707c18432d1703e5
+_md5_=dbbc192f34a8fb7f8195c52af957e921
diff --git a/metadata/md5-cache/dev-ruby/railties-5.1.2 b/metadata/md5-cache/dev-ruby/railties-5.1.2
index 63554f542ae1..fec20c6b7daf 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.1.2
+++ b/metadata/md5-cache/dev-ruby/railties-5.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm64 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-rails-0.23 ruby_targets_ruby22? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby22] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby22] >=dev-ruby/thor-0.18.1[ruby_targets_ruby22] >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] dev-ruby/method_source[ruby_targets_ruby22] ) ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby23] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.1.2[ruby_targets_ruby24] ~dev-ruby/actionpack-5.1.2[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.2.tar.gz -> rails-5.1.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b34f559e1c1099b200d1b5b1bae4a12f
+_md5_=ea4931cf3dda1de32b77a7c2093bae61
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
index 72e16c32e6b4..d91dbc8a04ca 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
 IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] dev-ruby/rubyzip:1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.4.3.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a61e305812a18100d8655c333afa376f
+_md5_=f35f8f9252624d162e5188f02989dd1f
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.8 b/metadata/md5-cache/dev-ruby/slim-3.0.8
index 5da325d5ece1..0de583646819 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.8
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sass[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/redcarpet[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sass[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sass[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sass[ruby_targets_ruby24] ) ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A template language aiming to reduce the syntax to the essential parts
 EAPI=6
 HOMEPAGE=http://slim-lang.com/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby21] <dev-ruby/tilt-2.1:*[ruby_targets_ruby21] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby22] <dev-ruby/tilt-2.1:*[ruby_targets_ruby22] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.8.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=78e7229e366ca5c54dc5db65112779db
+_md5_=f5df3f44fe3413f92c13a3bf6d3398ba
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.1.0 b/metadata/md5-cache/dev-ruby/xpath-2.1.0
index 8e8977a48796..e935053cc152 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.1.0
+++ b/metadata/md5-cache/dev-ruby/xpath-2.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/xpath
 IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.1.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0f09a17d03b501b3b1c0fff70710ddcf
+_md5_=07294647245fa7588c2c4017ce6c6763
diff --git a/metadata/md5-cache/dev-util/cargo-0.20.0 b/metadata/md5-cache/dev-util/cargo-0.20.0
new file mode 100644
index 000000000000..58131dadf8ca
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-0.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser >=dev-lang/rust-1.9.0:stable dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
+DESCRIPTION=The Rust's package manager
+EAPI=6
+HOMEPAGE=http://crates.io
+IUSE=doc libressl debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser !dev-util/cargo-bin net-misc/curl[ssl]
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/rust-lang/cargo/archive/0.20.0.tar.gz -> cargo-0.20.0.tar.gz https://crates.io/api/v1/crates/advapi32-sys/0.2.0/download -> advapi32-sys-0.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.3/download -> aho-corasick-0.6.3.crate https://crates.io/api/v1/crates/backtrace/0.3.2/download -> backtrace-0.3.2.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.11/download -> backtrace-sys-0.1.11.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargotest/0.1.0/download -> cargotest-0.1.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/cmake/0.1.24/download -> cmake-0.1.24.crate https://crates.io/api/v1/crates/crates-io/0.9.0/download -> crates-io-0.9.0.crate https://crates.io/api/v1/crates/crossbeam/0.2.10/download -> crossbeam-0.2.10.crate https://crates.io/api/v1/crates/curl/0.4.6/download -> curl-0.4.6.crate https://crates.io/api/v1/crates/curl-sys/0.3.12/download -> curl-sys-0.3.12.crate https://crates.io/api/v1/crates/dbghelp-sys/0.2.0/download -> dbghelp-sys-0.2.0.crate https://crates.io/api/v1/crates/docopt/0.7.0/download -> docopt-0.7.0.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/error-chain/0.10.0/download -> error-chain-0.10.0.crate https://crates.io/api/v1/crates/filetime/0.1.10/download -> filetime-0.1.10.crate https://crates.io/api/v1/crates/flate2/0.2.19/download -> flate2-0.2.19.crate https://crates.io/api/v1/crates/foreign-types/0.2.0/download -> foreign-types-0.2.0.crate https://crates.io/api/v1/crates/fs2/0.4.1/download -> fs2-0.4.1.crate https://crates.io/api/v1/crates/gcc/0.3.50/download -> gcc-0.3.50.crate https://crates.io/api/v1/crates/gdi32-sys/0.2.0/download -> gdi32-sys-0.2.0.crate https://crates.io/api/v1/crates/git2/0.6.6/download -> git2-0.6.6.crate https://crates.io/api/v1/crates/git2-curl/0.7.0/download -> git2-curl-0.7.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/hamcrest/0.1.1/download -> hamcrest-0.1.1.crate https://crates.io/api/v1/crates/idna/0.1.2/download -> idna-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.1.crate https://crates.io/api/v1/crates/jobserver/0.1.6/download -> jobserver-0.1.6.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.8/download -> lazy_static-0.2.8.crate https://crates.io/api/v1/crates/libc/0.2.23/download -> libc-0.2.23.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.12/download -> libgit2-sys-0.6.12.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.6/download -> libssh2-sys-0.2.6.crate https://crates.io/api/v1/crates/libz-sys/1.0.14/download -> libz-sys-1.0.14.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/matches/0.1.4/download -> matches-0.1.4.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.29/download -> net2-0.2.29.crate https://crates.io/api/v1/crates/num/0.1.37/download -> num-0.1.37.crate https://crates.io/api/v1/crates/num-bigint/0.1.37/download -> num-bigint-0.1.37.crate https://crates.io/api/v1/crates/num-complex/0.1.37/download -> num-complex-0.1.37.crate https://crates.io/api/v1/crates/num-integer/0.1.34/download -> num-integer-0.1.34.crate https://crates.io/api/v1/crates/num-iter/0.1.33/download -> num-iter-0.1.33.crate https://crates.io/api/v1/crates/num-rational/0.1.36/download -> num-rational-0.1.36.crate https://crates.io/api/v1/crates/num-traits/0.1.37/download -> num-traits-0.1.37.crate https://crates.io/api/v1/crates/num_cpus/1.5.0/download -> num_cpus-1.5.0.crate https://crates.io/api/v1/crates/openssl/0.9.13/download -> openssl-0.9.13.crate https://crates.io/api/v1/crates/openssl-probe/0.1.1/download -> openssl-probe-0.1.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.13/download -> openssl-sys-0.9.13.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/psapi-sys/0.1.0/download -> psapi-sys-0.1.0.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.2/download -> regex-0.2.2.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.4/download -> rustc-demangle-0.1.4.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/scoped-tls/0.1.0/download -> scoped-tls-0.1.0.crate https://crates.io/api/v1/crates/semver/0.7.0/download -> semver-0.7.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.8/download -> serde-1.0.8.crate https://crates.io/api/v1/crates/serde_derive/1.0.8/download -> serde_derive-1.0.8.crate https://crates.io/api/v1/crates/serde_derive_internals/0.15.1/download -> serde_derive_internals-0.15.1.crate https://crates.io/api/v1/crates/serde_ignored/0.0.3/download -> serde_ignored-0.0.3.crate https://crates.io/api/v1/crates/serde_json/1.0.2/download -> serde_json-1.0.2.crate https://crates.io/api/v1/crates/shell-escape/0.1.3/download -> shell-escape-0.1.3.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/tar/0.4.13/download -> tar-0.4.13.crate https://crates.io/api/v1/crates/tempdir/0.3.5/download -> tempdir-0.3.5.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread-id/3.1.0/download -> thread-id-3.1.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.4.1/download -> toml-0.4.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.3/download -> unicode-bidi-0.3.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.4/download -> unicode-normalization-0.1.4.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/url/1.4.1/download -> url-1.4.1.crate https://crates.io/api/v1/crates/user32-sys/0.2.0/download -> user32-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.1/download -> vcpkg-0.2.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate x86? ( https://static.rust-lang.org/dist/cargo-0.19.0-i686-unknown-linux-gnu.tar.gz ) amd64? ( https://static.rust-lang.org/dist/cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cargo	4a14060dec0a7e707d952d502c09ca2e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f34bb2b71392b3444926182bd3bcce8f
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.17.8 b/metadata/md5-cache/dev-util/checkbashisms-2.17.8
index c144317ad23a..afe732063196 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.17.8
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.17.8
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
 EAPI=5
 HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.17.8.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=5684b80d22da68b971468043ec310d52
+_md5_=3639107d3d158ec41763a49e9093c087
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.17.7 b/metadata/md5-cache/dev-util/checkbashisms-2.17.9
similarity index 50%
rename from metadata/md5-cache/dev-util/checkbashisms-2.17.7
rename to metadata/md5-cache/dev-util/checkbashisms-2.17.9
index 9e4ba4a3663f..ce5edf3094fe 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.17.7
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.17.9
@@ -1,12 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=5
+EAPI=6
 HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.17.7.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=5684b80d22da68b971468043ec310d52
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.17.9.tar.xz
+_md5_=3713e888b89bff49d8d10fafd5efea73
diff --git a/metadata/md5-cache/dev-util/conan-0.25.1 b/metadata/md5-cache/dev-util/conan-0.25.1
new file mode 100644
index 000000000000..2e4e028cbbb0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/conan-0.25.1
@@ -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_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/bottle-0.12.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/distro-1.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/future-0.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/node-semver-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/patch-1.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluginbase-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyjwt-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pylint-1.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-lang/go >=dev-python/mock-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-1.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-parameterized-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webtest-2.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Distributed C/C++ package manager
+EAPI=6
+HOMEPAGE=http://conan.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/bottle-0.12.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/distro-1.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/future-0.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/node-semver-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/patch-1.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluginbase-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyjwt-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pylint-1.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/conan/conan-0.25.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=908dbd8fd858f2d1686d01d527002ac5
diff --git a/metadata/md5-cache/dev-util/creduce-2.7.0 b/metadata/md5-cache/dev-util/creduce-2.7.0
index 65ea6fd019d3..28a8d88758b6 100644
--- a/metadata/md5-cache/dev-util/creduce-2.7.0
+++ b/metadata/md5-cache/dev-util/creduce-2.7.0
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:4 dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU dev-util/astyle dev-util/indent
 SLOT=0
 SRC_URI=http://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e19f06ebff8db0b343ed9b6e6da2f2d0
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.46.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.60.2
similarity index 74%
rename from metadata/md5-cache/dev-util/jenkins-bin-2.46.2
rename to metadata/md5-cache/dev-util/jenkins-bin-2.60.2
index 4271a5f0ab13..36682019f221 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.46.2
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.60.2
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://jenkins-ci.org/
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.7.0
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
 RESTRICT=mirror
 SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.46.2/jenkins.war -> jenkins-bin-2.46.2.war
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.60.2/jenkins.war -> jenkins-bin-2.60.2.war
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=4652f9bfbdaa532d663e0efd790b9832
+_md5_=1985c920b4162d4f6ce97d4b66581d14
diff --git a/metadata/md5-cache/dev-util/lldb-4.0.0-r1 b/metadata/md5-cache/dev-util/lldb-4.0.0-r1
index 0585df6371bf..e4e14a55d052 100644
--- a/metadata/md5-cache/dev-util/lldb-4.0.0-r1
+++ b/metadata/md5-cache/dev-util/lldb-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.0/lldb-4.0.0.src.tar.xz test? ( https://releases.llvm.org/4.0.0/llvm-4.0.0.src.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2bed25bf1d1e7a3b06d1d715a4b5e63e
diff --git a/metadata/md5-cache/dev-util/lldb-4.0.1 b/metadata/md5-cache/dev-util/lldb-4.0.1
index 473c25b2d188..06019c8159e4 100644
--- a/metadata/md5-cache/dev-util/lldb-4.0.1
+++ b/metadata/md5-cache/dev-util/lldb-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/lldb-4.0.1.src.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2bed25bf1d1e7a3b06d1d715a4b5e63e
diff --git a/metadata/md5-cache/dev-util/lldb-5.0.9999 b/metadata/md5-cache/dev-util/lldb-5.0.9999
new file mode 100644
index 000000000000..8be5a57669a0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-5.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.9999[xml] ~sys-devel/llvm-5.0.9999 !<sys-devel/llvm-4.0 python? ( <dev-lang/swig-3.0.9 ) test? ( ~dev-python/lit-5.0.9999[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.9999[xml] ~sys-devel/llvm-5.0.9999 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8806e81a3f683083571d84b291bbab85
diff --git a/metadata/md5-cache/dev-util/lldb-9999 b/metadata/md5-cache/dev-util/lldb-9999
index 2da6903e19e7..963b3fd8350a 100644
--- a/metadata/md5-cache/dev-util/lldb-9999
+++ b/metadata/md5-cache/dev-util/lldb-9999
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-9999[xml] ~sys-devel/llvm-9999 !<sys-devel/llvm-4.0
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7e96353e42f3ad00d65e3bd568e0d5a9
diff --git a/metadata/md5-cache/dev-util/meson-0.41.2 b/metadata/md5-cache/dev-util/meson-0.41.2
index 7178741a0018..79538cec96aa 100644
--- a/metadata/md5-cache/dev-util/meson-0.41.2
+++ b/metadata/md5-cache/dev-util/meson-0.41.2
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.41.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5834a59abbb9d5c0451273aa342e5db5
+_md5_=b9bbc83f3b50e2385eb192383fdcd38c
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-1.0 b/metadata/md5-cache/gnome-extra/zeitgeist-1.0
new file mode 100644
index 000000000000..7055a3e1a76c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst 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-libs/json-glib dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.35.4:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) fts? ( dev-libs/xapian:0=[inmemory] ) introspection? ( dev-libs/gobject-introspection ) telepathy? ( net-libs/telepathy-glib ) || ( dev-lang/vala:0.34 dev-lang/vala:0.32 ) >=sys-devel/gettext-0.19 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Service to log activities and present to other apps
+EAPI=6
+HOMEPAGE=https://launchpad.net/zeitgeist/
+IUSE=+datahub downloads-monitor +fts introspection nls sql-debug telepathy python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+ LGPL-3+ 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(-)] dev-libs/json-glib dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.35.4:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) fts? ( dev-libs/xapian:0=[inmemory] ) introspection? ( dev-libs/gobject-introspection ) telepathy? ( net-libs/telepathy-glib )
+REQUIRED_USE=|| ( python_targets_python2_7 ) downloads-monitor? ( datahub )
+SLOT=0
+SRC_URI=https://launchpad.net/zeitgeist/1.0/1.0/+download/zeitgeist-1.0.tar.xz https://dev.gentoo.org/~eva/distfiles/zeitgeist/zeitgeist-1.0.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	vala	f86cd45e9ae738c40c92f990266f39a7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=8ab84d9747f09ea9393ea36cc8553e74
diff --git a/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4 b/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
new file mode 100644
index 000000000000..038ea1969cc6
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Affiche allows people to 'stick' notes
+EAPI=6
+HOMEPAGE=http://www.collaboration-world.com/affiche
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.collaboration-world.com/affiche.data/releases/Stable/Affiche-0.6.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	935cef28cb1dbb8c28e04710473453fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=e5ae4825b92071be1bf516aebf7f1789
diff --git a/metadata/md5-cache/gnustep-apps/gshisen-1.3.0-r1 b/metadata/md5-cache/gnustep-apps/gshisen-1.3.0-r1
new file mode 100644
index 000000000000..518ecc68b1f0
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/gshisen-1.3.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=The first GNUstep game, similar to Mahjongg
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/gshisen/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GShisen-1.3.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	935cef28cb1dbb8c28e04710473453fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=d0c31bfce4d8135d53ffb60dca767718
diff --git a/metadata/md5-cache/gnustep-base/mknfonts-0.5-r2 b/metadata/md5-cache/gnustep-base/mknfonts-0.5-r2
new file mode 100644
index 000000000000..44d4aeb93cf9
--- /dev/null
+++ b/metadata/md5-cache/gnustep-base/mknfonts-0.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+DESCRIPTION=A tool to create .nfont packages for use with gnustep-back-art
+EAPI=6
+HOMEPAGE=https://packages.debian.org/mknfonts.tool
+IUSE=debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/m/mknfonts.tool/mknfonts.tool_0.5.orig.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnustep-base	935cef28cb1dbb8c28e04710473453fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=2c7e3aabfc5d05c90b841fb8aaa958a4
diff --git a/metadata/md5-cache/gnustep-libs/netclasses-1.1.0 b/metadata/md5-cache/gnustep-libs/netclasses-1.1.0
index 48af79076c76..67809c9ab60a 100644
--- a/metadata/md5-cache/gnustep-libs/netclasses-1.1.0
+++ b/metadata/md5-cache/gnustep-libs/netclasses-1.1.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
-SRC_URI=http://savannah.nongnu.org/download/gap/netclasses-1.1.0.tar.gz
+SRC_URI=https://savannah.nongnu.org/download/gap/netclasses-1.1.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	935cef28cb1dbb8c28e04710473453fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=eb61fac50424a8d3e6eaf0531f315e8c
+_md5_=e892d79ceeb52641dcf04dd31f22dd38
diff --git a/metadata/md5-cache/gnustep-libs/renaissance-0.9.0-r1 b/metadata/md5-cache/gnustep-libs/renaissance-0.9.0-r1
new file mode 100644
index 000000000000..e585f151ff52
--- /dev/null
+++ b/metadata/md5-cache/gnustep-libs/renaissance-0.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=GNUstep Renaissance allows to describe user interfaces XML files
+EAPI=6
+HOMEPAGE=http://www.gnustep.it/Renaissance/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.gnustep.it/Renaissance/Download/Renaissance-0.9.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	935cef28cb1dbb8c28e04710473453fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=7e1a25bfe661432d12b26d42028d6996
diff --git a/metadata/md5-cache/kde-apps/kdav-17.04.3 b/metadata/md5-cache/kde-apps/kdav-17.04.3
index 691cb44da21f..c89e10a5fc70 100644
--- a/metadata/md5-cache/kde-apps/kdav-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdav-17.04.3
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.34.0:5 >=kde-frameworks/kio-5.34.0:5 >=de
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdav-17.04.3.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	81f39ca48639c0c77f5e926b55e408f6	kde5-functions	d43be96d96de526c203e6bd430b24bd0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9143531d79eef98b1720f5264d13f0cf
+_md5_=bc7ce894bd9c40ada66865bb59f6b526
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.33 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.33
deleted file mode 100644
index 9692147f891e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.33
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-misc/shared-mime-info acl? ( virtual/acl ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) 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
-DESCRIPTION=Libraries needed for programs by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl +webkit test +handbook aqua
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-PDEPEND=x11-misc/xdg-utils handbook? ( kde-apps/khelpcenter:* ) policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-misc/shared-mime-info acl? ( virtual/acl ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] !aqua? ( x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils udisks? ( sys-fs/udisks:2 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) ) udev? ( app-misc/media-player-info ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) 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
-REQUIRED_USE=udisks? ( udev ) upower? ( udev )
-RESTRICT=test
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde4-base	51fd9f83640ac82e2c195c3958677fe7	kde4-functions	388bbabf76d84194e7d234ba7c7afee2	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ae39f0d9ef98c7588bb776263b4e3e43
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0
index 18dcadeb8650..4e543eafedc2 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.34.0
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/ki18n-5.34:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtxml-
 SLOT=5/5.34
 SRC_URI=mirror://kde/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	81f39ca48639c0c77f5e926b55e408f6	kde5-functions	d43be96d96de526c203e6bd430b24bd0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e27934735dc2246097a3232681be5922
+_md5_=e1e83ae1d65756895bb9e6e946a5b60f
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.36.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.36.0
index 9dd5277cea5e..6ef5e693f110 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.36.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.36.0
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/ki18n-5.36:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtxml-
 SLOT=5/5.36
 SRC_URI=mirror://kde/stable/frameworks/5.36/kunitconversion-5.36.0.tar.xz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	kde5	81f39ca48639c0c77f5e926b55e408f6	kde5-functions	d43be96d96de526c203e6bd430b24bd0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=2806dad06b8dcf84412e744a7a62fdb9
+_md5_=ab2040e89075dbc506e390ce32c5d451
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3_pre20170716 b/metadata/md5-cache/mail-mta/postfix-3.3_pre20170722
similarity index 96%
rename from metadata/md5-cache/mail-mta/postfix-3.3_pre20170716
rename to metadata/md5-cache/mail-mta/postfix-3.3_pre20170722
index 0b0bd4d6c671..ba2c99cde671 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.3_pre20170716
+++ b/metadata/md5-cache/mail-mta/postfix-3.3_pre20170722
@@ -9,6 +9,6 @@ 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.3-20170716.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.3-20170722.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=a458c84763867deacd7f418b4b403988
+_md5_=35c6073b51e20186792b5b290c65ee02
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.40 b/metadata/md5-cache/media-fonts/terminus-font-4.40
index 2be884110f64..e52ab10b9767 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.40
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.40
@@ -4,10 +4,10 @@ DESCRIPTION=A clean fixed font for the console and X11
 EAPI=6
 HOMEPAGE=http://terminus-font.sourceforge.net/
 IUSE=a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote raw-font-data ru-dv +ru-g ru-i ru-k X
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=OFL-1.1 GPL-2
 REQUIRED_USE=X? ( pcf )
 SLOT=0
 SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.40/terminus-font-4.40.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=4e590fa89210f2140a37872c51c01878
+_md5_=ee1e1980a6fb91b9863cafa51e4007d5
diff --git a/metadata/md5-cache/media-libs/assimp-4.0.0 b/metadata/md5-cache/media-libs/assimp-4.0.0
new file mode 100644
index 000000000000..7ef8d2e21083
--- /dev/null
+++ b/metadata/md5-cache/media-libs/assimp-4.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) sys-libs/zlib test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Importer library to import assets from 3D files
+EAPI=6
+HOMEPAGE=https://github.com/assimp/assimp
+IUSE=samples static test tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/assimp/assimp/archive/v4.0.0.tar.gz -> assimp-4.0.0.tar.gz
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=50b7d135bc82eaa1565f8b96a42c1cf7
diff --git a/metadata/md5-cache/media-libs/faac-1.29.3 b/metadata/md5-cache/media-libs/faac-1.29.3
new file mode 100644
index 000000000000..94b5ae25213b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/faac-1.29.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-portage/elt-patches-20170317
+DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
+EAPI=6
+HOMEPAGE=http://www.audiocoding.com
+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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1 MPEG-4
+SLOT=0
+SRC_URI=mirror://sourceforge/faac/faac-1.29.3.tar.gz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=b6ed6e642c6a59a14131bdb34e4c7c3b
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.4 b/metadata/md5-cache/media-libs/fontconfig-2.12.4
index cf5ff8221f2f..3d6636b05214 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.4
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.4
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.4.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=b92fc589d5fe01f3a587837df8def28c
+_md5_=216274bf9ed9b6f3db6ce51a17d8149e
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.29 b/metadata/md5-cache/media-libs/libpng-1.6.29
index e84424cf6917..2449c7d00387 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.29
+++ b/metadata/md5-cache/media-libs/libpng-1.6.29
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng
 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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.29.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.29-apng.patch.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=4e683c10fe7d1a8e4fd9ce9e001a0869
+_md5_=79cfb8153a33473c050f324faff3e5ae
diff --git a/metadata/md5-cache/media-libs/mesa-17.0.6 b/metadata/md5-cache/media-libs/mesa-17.0.6
index 0052706582f0..dfe3b737e313 100644
--- a/metadata/md5-cache/media-libs/mesa-17.0.6
+++ b/metadata/md5-cache/media-libs/mesa-17.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.0.6.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=ca73f41ef7e014b988fe5e47ac85e2dd
diff --git a/metadata/md5-cache/media-libs/mesa-17.0.7 b/metadata/md5-cache/media-libs/mesa-17.0.7
index 84b2d042e89e..22cb38971f2e 100644
--- a/metadata/md5-cache/media-libs/mesa-17.0.7
+++ b/metadata/md5-cache/media-libs/mesa-17.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.0.7.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=7a21e85393fa9d6c45ee6097cb0e12e1
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.0 b/metadata/md5-cache/media-libs/mesa-17.1.0
index 9e3c037119fe..d4854230e9f2 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.0
+++ b/metadata/md5-cache/media-libs/mesa-17.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.0.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=5ff183099c2a9224f0923937209faa57
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.1 b/metadata/md5-cache/media-libs/mesa-17.1.1
index 38221cfdc7ce..109199ee6b18 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.1
+++ b/metadata/md5-cache/media-libs/mesa-17.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.1.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=5ff183099c2a9224f0923937209faa57
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.2 b/metadata/md5-cache/media-libs/mesa-17.1.2
index 3b2cbb8b7e01..58c35ae9ec8e 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.2
+++ b/metadata/md5-cache/media-libs/mesa-17.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.2.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=b5b2d65f5e2d56534acee7a15786e94f
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.3 b/metadata/md5-cache/media-libs/mesa-17.1.3
index 1a43d00d307d..0282b698eb66 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.3
+++ b/metadata/md5-cache/media-libs/mesa-17.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.3.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=b5b2d65f5e2d56534acee7a15786e94f
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.4 b/metadata/md5-cache/media-libs/mesa-17.1.4
index 105c1d4999f6..89480f72eb3e 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.4
+++ b/metadata/md5-cache/media-libs/mesa-17.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.4.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=b5b2d65f5e2d56534acee7a15786e94f
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.5 b/metadata/md5-cache/media-libs/mesa-17.1.5
index 7554cf4ca09a..ace9a101ae0f 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.5
+++ b/metadata/md5-cache/media-libs/mesa-17.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.5.tar.xz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=b5b2d65f5e2d56534acee7a15786e94f
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index c55f6ee99c5c..0b46b2868273 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -9,5 +9,5 @@ RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? (
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( 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_vc4? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	llvm	45ef89988bfb458ac81bb566c1eaa437	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	git-r3	cbafa3261c37c7e3af44bb16a34ea390	libtool	e32ea84bf82cf8987965b574672dba93	llvm	2564476f64d2d9b62d757ff42101ff7b	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=bcdcc49a858270ac6d76cd5474255825
diff --git a/metadata/md5-cache/media-sound/mpg123-1.25.1 b/metadata/md5-cache/media-sound/mpg123-1.25.3
similarity index 97%
rename from metadata/md5-cache/media-sound/mpg123-1.25.1
rename to metadata/md5-cache/media-sound/mpg123-1.25.3
index bde8f416ef9e..0d3eefca8b5e 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.25.1
+++ b/metadata/md5-cache/media-sound/mpg123-1.25.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
-SRC_URI=http://www.mpg123.org/download/mpg123-1.25.1.tar.bz2
+SRC_URI=http://www.mpg123.org/download/mpg123-1.25.3.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
 _md5_=e5cbd918363a36f92a111b7c6446d775
diff --git a/metadata/md5-cache/media-sound/podracer-1.4-r1 b/metadata/md5-cache/media-sound/podracer-1.4-r2
similarity index 78%
rename from metadata/md5-cache/media-sound/podracer-1.4-r1
rename to metadata/md5-cache/media-sound/podracer-1.4-r2
index 687547f7eaad..3063a2f0cf6a 100644
--- a/metadata/md5-cache/media-sound/podracer-1.4-r1
+++ b/metadata/md5-cache/media-sound/podracer-1.4-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install unpack
 DESCRIPTION=A simple podcast aggregator, designed for cron
 EAPI=6
 HOMEPAGE=http://podracer.sourceforge.net/
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=app-shells/bash net-misc/curl
 SLOT=0
 SRC_URI=mirror://sourceforge/podracer/podracer-1.4.tar.bz2
-_md5_=de5b18f8b569507d2d5e75263b60e285
+_md5_=ae1784e2ad58e2417ea383b55e4bd575
diff --git a/metadata/md5-cache/media-tv/mythtv-0.28.1-r1 b/metadata/md5-cache/media-tv/mythtv-0.28.1-r1
new file mode 100644
index 000000000000..dd8b7e594b99
--- /dev/null
+++ b/metadata/md5-cache/media-tv/mythtv-0.28.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure info install postinst preinst prepare setup unpack
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-proto/xf86vidmodeproto x11-proto/xineramaproto virtual/pkgconfig
+DESCRIPTION=Homebrew PVR project
+EAPI=5
+HOMEPAGE=https://www.mythtv.org
+IUSE=alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
+REQUIRED_USE=python_targets_python2_7 bluray? ( xml ) theora? ( vorbis )
+SLOT=0/0.28.1
+SRC_URI=https://github.com/MythTV/mythtv/archive/03f44039848bd09444ff4baa8dc158bd61454079.tar.gz -> mythtv-0.28.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=790915dbb814b6f5b43858587f1ca693
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.6.3 b/metadata/md5-cache/net-analyzer/icinga2-2.6.3-r1
similarity index 97%
rename from metadata/md5-cache/net-analyzer/icinga2-2.6.3
rename to metadata/md5-cache/net-analyzer/icinga2-2.6.3-r1
index 30a8dcf12219..6bc45d958684 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.6.3
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.6.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.6.3.tar.gz -> icinga2-2.6.3.tar.gz
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=a4d4d12c1c38b0825f7dc3323ee50bba
+_md5_=7db2f4a88a11539c912f478c9f493d28
diff --git a/metadata/md5-cache/net-analyzer/suricata-3.2-r1 b/metadata/md5-cache/net-analyzer/suricata-3.2-r1
index 79181c2f3074..0ddd1d141b33 100644
--- a/metadata/md5-cache/net-analyzer/suricata-3.2-r1
+++ b/metadata/md5-cache/net-analyzer/suricata-3.2-r1
@@ -7,7 +7,8 @@ IUSE=+af-packet control-socket cuda debug +detection geoip hardened logrotate lu
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss >=net-libs/libhtp-0.5.20 net-libs/libpcap sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) logrotate? ( app-admin/logrotate ) sys-libs/libcap-ng
+REQUIRED_USE=lua? ( !luajit )
 SLOT=0
 SRC_URI=http://www.openinfosecfoundation.org/download/suricata-3.2.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=4d40aff89796d627b30195454eabff48
+_md5_=7ef0c193db7c77fd4c2a91327788313f
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.1
new file mode 100644
index 000000000000..1d173faf2ade
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst setup test
+DEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0 ) libressl? ( dev-libs/libressl ) ) drop-root? ( virtual/pkgconfig ) test? ( || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) dev-lang/perl )
+DESCRIPTION=A Tool for network monitoring and data acquisition
+EAPI=6
+HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
+IUSE=+drop-root libressl smi ssl samba suid test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0 ) libressl? ( dev-libs/libressl ) )
+SLOT=0
+SRC_URI=https://github.com/the-tcpdump-group/tcpdump/archive/tcpdump-4.9.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=a280dd8c11dc7d06ba8d4a2bd7bc9e74
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.3 b/metadata/md5-cache/net-dns/libidn2-2.0.3
new file mode 100644
index 000000000000..d87de5604651
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn2-2.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,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-lang/perl sys-apps/help2man
+DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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+ LGPL-3+
+RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,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://gnu/libidn/libidn2-2.0.3.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=c6549803fb3a5d7aa2b63b22d0d559d7
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.5.1 b/metadata/md5-cache/net-firewall/shorewall-5.1.5.1
new file mode 100644
index 000000000000..6d5e6012a6b1
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.5/shorewall-core-5.1.5.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.5/shorewall-5.1.5.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.5/shorewall6-5.1.5.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.5/shorewall-lite-5.1.5.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.5/shorewall6-lite-5.1.5.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.5/shorewall-init-5.1.5.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.5/shorewall-docs-html-5.1.5.1.tar.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	df8265631f8bf5f5df387e9b987121f9	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7d924d32d7594f4cc11ff661caa1a730
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.1.9 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.1.15
similarity index 83%
rename from metadata/md5-cache/net-im/telegram-desktop-bin-1.1.9
rename to metadata/md5-cache/net-im/telegram-desktop-bin-1.1.15
index 234e7dfa3a0a..36609688b7c3 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.1.9
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.1.15
@@ -7,6 +7,6 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=telegram
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.1.9.tar.gz -> tdesktop-1.1.9.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.1.9.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.1.9.tar.xz )
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.1.15.tar.gz -> tdesktop-1.1.15.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.1.15.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.1.15.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=42caf54d854be42540d51a3ee2cb04ec
diff --git a/metadata/md5-cache/net-irc/shadowircd-6.3.3-r1 b/metadata/md5-cache/net-irc/shadowircd-6.3.3-r1
new file mode 100644
index 000000000000..0b737a279896
--- /dev/null
+++ b/metadata/md5-cache/net-irc/shadowircd-6.3.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=ssl? ( dev-libs/openssl:0 ) zlib? ( sys-libs/zlib ) virtual/yacc sys-devel/flex
+DESCRIPTION=An IRCd based on charybdis that adds several useful features
+EAPI=6
+HOMEPAGE=http://shadowircd.net
+IUSE=debug +ipv6 largenet ssl zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/shadowircd/shadowircd/archive/shadowircd-6.3.3.tar.gz
+_eclasses_=user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=0cffec7ef86cc3b246c26d03bfb70314
diff --git a/metadata/md5-cache/net-irc/znc-1.6.5 b/metadata/md5-cache/net-irc/znc-1.6.5
index 56ab8a92d50f..97604609f925 100644
--- a/metadata/md5-cache/net-irc/znc-1.6.5
+++ b/metadata/md5-cache/net-irc/znc-1.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=An advanced IRC Bouncer
 EAPI=6
 HOMEPAGE=http://znc.in
 IUSE=daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:= ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://znc.in/releases/archive/znc-1.6.5.tar.gz test? ( https://github.com/google/googletest/archive/release-1.7.0.tar.gz -> googletest-release-1.7.0.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=62bde46cd7b7f909846e287e98b628fd
+_md5_=577a57a33720127528aebdbb5d40b989
diff --git a/metadata/md5-cache/net-libs/liboping-1.10.0 b/metadata/md5-cache/net-libs/liboping-1.10.0
index 77569b2b90fa..c3d5fe28ecb2 100644
--- a/metadata/md5-cache/net-libs/liboping-1.10.0
+++ b/metadata/md5-cache/net-libs/liboping-1.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Protocol independent ANSI-C ping library and command line utility
 EAPI=6
 HOMEPAGE=https://noping.cc/
 IUSE=+filecaps ncurses perl +filecaps
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 arm ~x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) dev-lang/perl:=
 SLOT=0/0.3
 SRC_URI=https://noping.cc/files/liboping-1.10.0.tar.bz2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	fcaps	e80204189039ecc03f24151c518375f0	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=ede01b1314fe68c3e0ab50a163346aea
+_md5_=d50e4538201d5673e3dcaaeaa341753d
diff --git a/metadata/md5-cache/net-misc/openvswitch-1.11.0 b/metadata/md5-cache/net-misc/openvswitch-1.11.0
deleted file mode 100644
index 7985590c4148..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-1.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-conch[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] pyside? ( dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) !pyside? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=5
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +pyside +ssl kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-conch[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] pyside? ( dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) !pyside? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=monitor? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-1.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=508cc2f4c47e56638132582c9e58cd68
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.0.0-r3 b/metadata/md5-cache/net-misc/openvswitch-2.0.0-r3
deleted file mode 100644
index 5920cf281a51..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.0.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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=Production quality, multilayer virtual switch
-EAPI=5
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=monitor? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-2.0.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0ef84deac125354063858f2c20d8ad6b
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.1.3 b/metadata/md5-cache/net-misc/openvswitch-2.1.3
deleted file mode 100644
index 13f3b3694537..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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=Production quality, multilayer virtual switch
-EAPI=5
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=>=sys-apps/openrc-0.10.5 ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=monitor? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-2.1.3.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=59e6624bc6899f4c72818464ecb5746b
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.5.0 b/metadata/md5-cache/net-misc/openvswitch-2.5.0
deleted file mode 100644
index f8c20c2e6398..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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=Production quality, multilayer virtual switch
-EAPI=5
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) monitor? ( python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=monitor? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-2.5.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ef1903437c2be71d6398c80a2ded38c0
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.7.0 b/metadata/md5-cache/net-misc/openvswitch-2.7.0
deleted file mode 100644
index a9c8a93a98e8..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.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(-)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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 ) virtual/pkgconfig
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=6
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.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(-)] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-2.7.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7c2e9dbb708dd344a4e21abfa4b21d5d
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.7.0-r2 b/metadata/md5-cache/net-misc/openvswitch-2.7.0-r2
deleted file mode 100644
index 80d1cc9c2f6b..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.7.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.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(-)] dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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 ) virtual/pkgconfig
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=6
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.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(-)] dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-2.7.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1b7be70e40fc2f161f5e20af2a673730
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.7.0-r3 b/metadata/md5-cache/net-misc/openvswitch-2.7.0-r3
deleted file mode 100644
index 317f171023ed..000000000000
--- a/metadata/md5-cache/net-misc/openvswitch-2.7.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
-DEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.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(-)] dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) virtual/pkgconfig >=app-portage/elt-patches-20170317 !<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 ) virtual/pkgconfig
-DESCRIPTION=Production quality, multilayer virtual switch
-EAPI=6
-HOMEPAGE=http://openvswitch.org
-IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.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(-)] dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-2.7.0.tar.gz
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1ef075a7ba168d8067f19d4e5d60d1ba
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.7.0-r1 b/metadata/md5-cache/net-misc/openvswitch-2.7.2
similarity index 96%
rename from metadata/md5-cache/net-misc/openvswitch-2.7.0-r1
rename to metadata/md5-cache/net-misc/openvswitch-2.7.2
index 09919007bcb5..e4953300b887 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.7.0-r1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Production quality, multilayer virtual switch
 EAPI=6
 HOMEPAGE=http://openvswitch.org
 IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.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(-)] dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=http://openvswitch.org/releases/openvswitch-2.7.0.tar.gz
+SRC_URI=http://openvswitch.org/releases/openvswitch-2.7.2.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e7c71b776e5e27ea1d9d49979f321a86
+_md5_=c3e74ad5e7bd8ed85c2a7d4797a3b0bf
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.07.02 b/metadata/md5-cache/net-misc/youtube-dl-2017.07.23
similarity index 97%
rename from metadata/md5-cache/net-misc/youtube-dl-2017.07.02
rename to metadata/md5-cache/net-misc/youtube-dl-2017.07.23
index 9c7ef1e08c27..eedcfdadd849 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.07.02
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.07.23
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2017.07.02/youtube-dl-2017.07.02.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2017.07.23/youtube-dl-2017.07.23.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=98be29ab0a1a9869914431c674845621
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r1 b/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
similarity index 98%
rename from metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r1
rename to metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
index 11a9fe3dc6e6..825b22013f5a 100644
--- a/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r1
+++ b/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Bitmessage/PyBitmessage/archive/v0.6.2.tar.gz -> pybitmessage-0.6.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4f655a9adc84a52955ae86fb7d594767
+_md5_=a46f2019705a86137a16f402d92819d4
diff --git a/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212 b/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212
index c5ada85251c5..a819890db92e 100644
--- a/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212
+++ b/metadata/md5-cache/net-wireless/bluez-tools-0_p20161212
@@ -3,10 +3,10 @@ DEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-wireless/bluez[obex] sys-libs/read
 DESCRIPTION=A set of tools to manage bluetooth devices for linux
 EAPI=6
 HOMEPAGE=https://github.com/khvzak/bluez-tools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 net-wireless/bluez[obex] sys-libs/readline:0
 SLOT=0
 SRC_URI=https://github.com/khvzak/bluez-tools/archive/97efd293491ad7ec96a655665339908f2478b3d1.tar.gz -> bluez-tools-0_p20161212.tar.gz
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=4a98724eb2241a963b872267ef0ac42c
+_md5_=0b6a4cae75dab7c218e187711959fbec
diff --git a/metadata/md5-cache/sci-libs/mpir-3.0.0 b/metadata/md5-cache/sci-libs/mpir-3.0.0
new file mode 100644
index 000000000000..0d321af851e7
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mpir-3.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm ) >=app-portage/elt-patches-20170317 !<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 arbitrary precision integer arithmetic (fork of gmp)
+EAPI=6
+HOMEPAGE=http://www.mpir.org/
+IUSE=+cxx cpudetection static-libs
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+SLOT=0/23
+SRC_URI=http://www.mpir.org/mpir-3.0.0.tar.bz2
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	e32ea84bf82cf8987965b574672dba93	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=ea7f800e8750340955186007bf91c2d9
diff --git a/metadata/md5-cache/sci-libs/o2scl-0.920 b/metadata/md5-cache/sci-libs/o2scl-0.920
new file mode 100644
index 000000000000..371a5b713064
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/o2scl-0.920
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install pretend setup
+DEPEND=dev-libs/boost:0= >=sci-libs/gsl-2:0= virtual/cblas:= eigen? ( dev-cpp/eigen:3 ) armadillo? ( sci-libs/armadillo[lapack] ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig
+DESCRIPTION=Object-oriented Scientific Computing Library
+EAPI=6
+HOMEPAGE=http://web.utk.edu/~asteine1/o2scl
+IUSE=armadillo debug doc examples eigen fftw gsl hdf5 openmp readline static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost:0= >=sci-libs/gsl-2:0= virtual/cblas:= eigen? ( dev-cpp/eigen:3 ) armadillo? ( sci-libs/armadillo[lapack] ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://github.com/awsteiner/o2scl/releases/download/v0.920/o2scl-0.920.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=5d6f3fb7c5c9c17cf896a487da7dcbde
diff --git a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7 b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
new file mode 100644
index 000000000000..7d6328190c4b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/motif:= ) tk? ( dev-lang/tk:= ) doc? ( virtual/latex-base ) virtual/fortran
+DESCRIPTION=FORTRAN/C device-independent scientific graphic library
+EAPI=6
+HOMEPAGE=http://www.astro.caltech.edu/~tjp/pgplot/
+IUSE=doc motif static-libs tk
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=free-noncomm
+RDEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/motif:= ) tk? ( dev-lang/tk:= ) virtual/fortran
+SLOT=0
+SRC_URI=ftp://ftp.astro.caltech.edu/pub/pgplot/pgplot522.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=da5ae1f84a3f2d63863ad6eaae38835b
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.0.153 b/metadata/md5-cache/sci-mathematics/rstudio-1.0.153
new file mode 100644
index 000000000000..250e93fc4df0
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.0.153
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=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[X,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 ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=IDE for the R language
+EAPI=6
+HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
+IUSE=dedicated server elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+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.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=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[X,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-r3
+SLOT=0
+SRC_URI=https://github.com/rstudio/rstudio/archive/v1.0.153.tar.gz -> rstudio-1.0.153.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	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	fdo-mime	21ef5adf81836863efa968f2a25cff64	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	4f95120230a315c8caaabeb2307b7eee	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=94ad3211de9da98951bddbb9d6288bfa
diff --git a/metadata/md5-cache/sys-block/gparted-0.28.1 b/metadata/md5-cache/sys-block/gparted-0.28.1
new file mode 100644
index 000000000000..cd788ddb1779
--- /dev/null
+++ b/metadata/md5-cache/sys-block/gparted-0.28.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-libs/glib-2:2 >=sys-block/parted-3.2:= app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome Partition Editor
+EAPI=6
+HOMEPAGE=http://gparted.sourceforge.net/
+IUSE=btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs
+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-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( sys-auth/polkit ) >=sys-apps/util-linux-2.20 >=sys-fs/e2fsprogs-1.41 btrfs? ( sys-fs/btrfs-progs ) cryptsetup? ( sys-fs/cryptsetup ) 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.28.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=dea665980c0497b219918892cb63c156
diff --git a/metadata/md5-cache/sys-devel/clang-4.0.0-r2 b/metadata/md5-cache/sys-devel/clang-4.0.0-r2
index b48589701026..d257990d8a1b 100644
--- a/metadata/md5-cache/sys-devel/clang-4.0.0-r2
+++ b/metadata/md5-cache/sys-devel/clang-4.0.0-r2
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-4.0.0:4=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.0/cfe-4.0.0.src.tar.xz https://releases.llvm.org/4.0.0/clang-tools-extra-4.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm-manpages-4.0.0.tar.bz2 ) test? ( https://releases.llvm.org/4.0.0/llvm-4.0.0.src.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=190396570eac6c2742245f13ee3e5b69
diff --git a/metadata/md5-cache/sys-devel/clang-4.0.1 b/metadata/md5-cache/sys-devel/clang-4.0.1
index 79d256149002..2453b456fc92 100644
--- a/metadata/md5-cache/sys-devel/clang-4.0.1
+++ b/metadata/md5-cache/sys-devel/clang-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-4.0.1:4=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/cfe-4.0.1.src.tar.xz https://releases.llvm.org/4.0.1/clang-tools-extra-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 ) test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d0891d9449ac110d324d4ff3ca21d566
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.9999 b/metadata/md5-cache/sys-devel/clang-5.0.9999
new file mode 100644
index 000000000000..082d6a20e696
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-5.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-5.0.9999:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) test? ( ~dev-python/lit-5.0.9999[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=C language family frontend for LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx +doc multitarget +static-analyzer test xml z3 elibc_musl kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 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
+LICENSE=UoI-NCSA
+PDEPEND=~sys-devel/clang-runtime-5.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-5.0.9999* ) default-libcxx? ( sys-libs/libcxx )
+RDEPEND=~sys-devel/llvm-5.0.9999:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=5
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dbed95e1c4f0332dc1c41d4e7cbc917d
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index 5e82705d06f9..4439c4586390 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-9999:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) test? ( ~dev-python/lit-9999[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=~sys-devel/llvm-9999:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) test? ( ~dev-python/lit-9999[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx +doc multitarget +static-analyzer test xml z3 elibc_musl kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 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
 LICENSE=UoI-NCSA
 PDEPEND=~sys-devel/clang-runtime-9999 default-compiler-rt? ( =sys-libs/compiler-rt-9999* ) default-libcxx? ( sys-libs/libcxx )
-RDEPEND=~sys-devel/llvm-9999:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+RDEPEND=~sys-devel/llvm-9999:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=5
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1b8d63cf435923aa21c025dd349bba7f
+SLOT=6
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a138bbc3b0c4556ad846e0749e8cd2a9
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-5.0.9999 b/metadata/md5-cache/sys-devel/clang-runtime-5.0.9999
new file mode 100644
index 000000000000..4bd96d691a60
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-5.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=6
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 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=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-5.0.9999:5.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-5.0.9999:5.0.0 ) ) libcxx? ( >=sys-libs/libcxx-5.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-5.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,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=sanitize? ( compiler-rt )
+SLOT=5.0.0
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=b0f469a5e237119b3a49469fc33d1533
diff --git a/metadata/md5-cache/sys-devel/lld-4.0.0 b/metadata/md5-cache/sys-devel/lld-4.0.0
index 67a7bb12c049..cea1a5294565 100644
--- a/metadata/md5-cache/sys-devel/lld-4.0.0
+++ b/metadata/md5-cache/sys-devel/lld-4.0.0
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-4.0.0
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.0/lld-4.0.0.src.tar.xz test? ( https://releases.llvm.org/4.0.0/llvm-4.0.0.src.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6d6018b1b4c06c0c3f43e54692f0c92d
diff --git a/metadata/md5-cache/sys-devel/lld-4.0.1 b/metadata/md5-cache/sys-devel/lld-4.0.1
index 272a8621459e..e9278332f1d4 100644
--- a/metadata/md5-cache/sys-devel/lld-4.0.1
+++ b/metadata/md5-cache/sys-devel/lld-4.0.1
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-4.0.1
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/lld-4.0.1.src.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1ec07db9df5026b575faaee5402d40f8
diff --git a/metadata/md5-cache/sys-devel/lld-5.0.9999 b/metadata/md5-cache/sys-devel/lld-5.0.9999
new file mode 100644
index 000000000000..96946b493f7e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-5.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-5.0.9999 test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-5.0.9999
+SLOT=0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cf2176c06c0c220958e58ea2f55c9842
diff --git a/metadata/md5-cache/sys-devel/lld-9999 b/metadata/md5-cache/sys-devel/lld-9999
index 0832bc7ae9fd..db658877bb6b 100644
--- a/metadata/md5-cache/sys-devel/lld-9999
+++ b/metadata/md5-cache/sys-devel/lld-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-9999
 SLOT=0
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e1b7fe86f78dd178cc4f11e3c4b791a3
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.9999 b/metadata/md5-cache/sys-devel/llvm-5.0.9999
new file mode 100644
index 000000000000..164f63d4bb8d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-5.0.9999.9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Low Level Virtual Machine
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug +doc gold libedit +libffi ncurses test elibc_musl kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 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=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
+PDEPEND=sys-devel/llvm-common gold? ( sys-devel/llvmgold )
+RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=5
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fa13b06e5a53f7426e74794de3628303
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 1cb2e8da459a..0f1121d8dba2 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -8,6 +8,6 @@ LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
 PDEPEND=sys-devel/llvm-common gold? ( sys-devel/llvmgold )
 RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=5
+SLOT=6
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=35165b9ab2b6c3f8d24c602dc9fc0f46
+_md5_=15b9518bf2404122a3396049c2f71fde
diff --git a/metadata/md5-cache/sys-devel/llvm-common-5.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-5.0.9999
new file mode 100644
index 000000000000..99cc74d0ca24
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-5.0.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+_eclasses_=git-r3	cbafa3261c37c7e3af44bb16a34ea390
+_md5_=30a9c29c9cf527db494aad648312c634
diff --git a/metadata/md5-cache/sys-devel/llvmgold-6 b/metadata/md5-cache/sys-devel/llvmgold-6
new file mode 100644
index 000000000000..dd4cdb975840
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvmgold-6
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install
+DESCRIPTION=LLVMgold plugin symlink for autoloading
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=public-domain
+RDEPEND=sys-devel/llvm:6[gold] !sys-devel/llvm:0
+SLOT=0
+_md5_=438803f273c586bc97a68a8f6f09796f
diff --git a/metadata/md5-cache/sys-kernel/dracut-045-r2 b/metadata/md5-cache/sys-kernel/dracut-045-r2
index 396f656bfedf..4c28a7e414d9 100644
--- a/metadata/md5-cache/sys-kernel/dracut-045-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-045-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Generic initramfs generation tool
 EAPI=6
 HOMEPAGE=https://dracut.wiki.kernel.org
 IUSE=debug selinux
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >=app-shells/bash-4.0:0 || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) sys-apps/coreutils[xattr(-)] >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut ) !net-analyzer/arping
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-045.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8fb70134e2ae8c2a9b1ad5757ba20894
+_md5_=9e2c0efadb1ffb5df8a24e0faa7ae4e0
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.13_rc2 b/metadata/md5-cache/sys-kernel/git-sources-4.13_rc2
new file mode 100644
index 000000000000..88b3d39dd21a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.13_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !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.13_rc2
+SRC_URI=https://git.kernel.org/torvalds/p/v4.13-rc2/v4.12 -> patch-4.13-rc2.patch mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	kernel-2	1241c87493492a950598df999f91e603	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=db7d2379238e40e18b5bd232ce44f2e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-4.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-4.0.0
index 1dc5adea711a..226daa9fd68f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-4.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-4.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!=sys-libs/compiler-rt-4.0.0*:0
 SLOT=4.0.0
 SRC_URI=https://releases.llvm.org/4.0.0/compiler-rt-4.0.0.src.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b4896fedef84eb289f2e936c633033e8
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-4.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
index 3bc6b24f8264..cf882e8e6922 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!=sys-libs/compiler-rt-4.0.1*:0
 SLOT=4.0.1
 SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=158100856de1535117c735370ed585a5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-5.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-5.0.9999
new file mode 100644
index 000000000000..c14ea8648f88
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-5.0.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-5.0.9999*:5 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=|| ( UoI-NCSA MIT )
+SLOT=5.0.0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9fa52e86988129d4749e5d8d5ba15059
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9999 b/metadata/md5-cache/sys-libs/compiler-rt-9999
index 410cac3b0058..62b3b882cf70 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:5 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:6 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
 LICENSE=|| ( UoI-NCSA MIT )
-SLOT=5.0.0
-_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1c7fde0b246921f684f1cf8d5fbbfe38
+SLOT=6.0.0
+_eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=21383215369839e21c52700cfac99f57
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.0
index 107b623c3072..7758a5f61d38 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!=sys-libs/compiler-rt-sanitizers-4.0.0*:0
 SLOT=4.0.0
 SRC_URI=https://releases.llvm.org/4.0.0/compiler-rt-4.0.0.src.tar.xz test? ( https://releases.llvm.org/4.0.0/llvm-4.0.0.src.tar.xz )
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=85d4fa514ce74194d1f4a2d093c45ede
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
index d07571f5a1e3..932678ecc2c4 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!=sys-libs/compiler-rt-sanitizers-4.0.1*:0
 SLOT=4.0.1
 SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=85d4fa514ce74194d1f4a2d093c45ede
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.9999
new file mode 100644
index 000000000000..edf297683e2d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-4 test? ( app-portage/unsandbox || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-5.0.9999*:5 sys-libs/compiler-rt:5.0.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=|| ( UoI-NCSA MIT )
+SLOT=5.0.0
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=194c0225356df6cd1c514541950c6659
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
index 6c8b3d65ad19..6d24f87a40fb 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-4 test? ( app-portage/unsandbox || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:5 sys-libs/compiler-rt:5.0.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=>=sys-devel/llvm-4 test? ( app-portage/unsandbox || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:6 sys-libs/compiler-rt:6.0.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test
 LICENSE=|| ( UoI-NCSA MIT )
-SLOT=5.0.0
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=59a3ab45531f1b8f9219a9860522334a
+SLOT=6.0.0
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ce7334ba25eee555781b0140acbd9346
diff --git a/metadata/md5-cache/sys-libs/libcxx-4.0.0 b/metadata/md5-cache/sys-libs/libcxx-4.0.0
index f5067094b14e..6318d858eda5 100644
--- a/metadata/md5-cache/sys-libs/libcxx-4.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-4.0.0[libunwind=,static-libs?,abi_x86_3
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.0/libcxx-4.0.0.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5f0c2f3c9095efca17a277d6169850cc
diff --git a/metadata/md5-cache/sys-libs/libcxx-4.0.1 b/metadata/md5-cache/sys-libs/libcxx-4.0.1
index cd4ed98f65ab..3f07edca21c7 100644
--- a/metadata/md5-cache/sys-libs/libcxx-4.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-4.0.1[libunwind=,static-libs?,abi_x86_3
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/libcxx-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=5f0c2f3c9095efca17a277d6169850cc
diff --git a/metadata/md5-cache/sys-libs/libcxx-5.0.9999 b/metadata/md5-cache/sys-libs/libcxx-5.0.9999
new file mode 100644
index 000000000000..8fef16191c09
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-5.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-5.0.9999[libunwind=,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(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,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(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) app-arch/xz-utils >=sys-devel/llvm-4 >=dev-vcs/git-1.8.2.1 dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=6
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +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
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-5.0.9999[libunwind=,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(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,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(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
+REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
+SLOT=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=efcb8f04a1f58f20f456440353216d4e
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index 87635ccc87a3..e97643b52d9b 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9999
+++ b/metadata/md5-cache/sys-libs/libcxx-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-9999[libunwind=,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(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,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(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 SLOT=0
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9b1286fb962060d72b0a9d602d9fec81
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-4.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-4.0.0
index 009c3faa4c20..94ac73c9a04d 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-4.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-4.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.0/libcxxabi-4.0.0.src.tar.xz https://releases.llvm.org/4.0.0/libcxx-4.0.0.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=05e004425ad7cf5392a7cba865396ae0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-4.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-4.0.1
index 02ef754e89ac..7317a7f95ca6 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-4.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/libcxxabi-4.0.1.src.tar.xz https://releases.llvm.org/4.0.1/libcxx-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=05e004425ad7cf5392a7cba865396ae0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-5.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-5.0.9999
new file mode 100644
index 000000000000..b360b37e20bd
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-5.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) ) >=sys-devel/llvm-4 test? ( >=sys-devel/clang-3.9.0 ~sys-libs/libcxx-5.0.9999[libcxxabi(-)] || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=6
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind +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
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) )
+SLOT=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ba694b49a95a72f15a730cd1d032e8a1
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9999 b/metadata/md5-cache/sys-libs/libcxxabi-9999
index 84bb7a310de3..858853fd6ae0 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-9999
@@ -7,5 +7,5 @@ IUSE=+libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) )
 SLOT=0
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=68907e5758b424a14f88633a13526941
diff --git a/metadata/md5-cache/sys-libs/libomp-5.0.9999 b/metadata/md5-cache/sys-libs/libomp-5.0.9999
new file mode 100644
index 000000000000..fdf9dc0fc1de
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-5.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc: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-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm >=sys-devel/clang-3.9.0 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=6
+HOMEPAGE=https://openmp.llvm.org
+IUSE=hwloc ompt 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=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
+RDEPEND=hwloc? ( sys-apps/hwloc: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=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9e2033a50b4757dc3750880e7830827e
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.0
index efd76533dd97..ab4e46989a5d 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.0/libunwind-4.0.0.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=90dd57902e7e16c2a63170b7cc2c0f13
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1
index b3beeb76b1dc..3e8f4caf8902 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-4.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/libunwind-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=90dd57902e7e16c2a63170b7cc2c0f13
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.9999
new file mode 100644
index 000000000000..961716027004
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-4 dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=6
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug +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
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+SLOT=0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6b18be3a884caa1608446417d2c31c45
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
index e22649a1db18..b05e6ea2d2d4 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
@@ -7,5 +7,5 @@ IUSE=debug +static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 SLOT=0
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	45ef89988bfb458ac81bb566c1eaa437	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	llvm	2564476f64d2d9b62d757ff42101ff7b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9dad3de03fc033c88607fccd6e9f01d7
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8-r1 b/metadata/md5-cache/sys-power/bbswitch-0.8-r1
new file mode 100644
index 000000000000..414ab0738589
--- /dev/null
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
+EAPI=6
+HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a0cb0915cbb63720fbc92f43cd8e97bb
diff --git a/metadata/md5-cache/sys-power/bbswitch-9999 b/metadata/md5-cache/sys-power/bbswitch-9999
new file mode 100644
index 000000000000..1c181e7c1a14
--- /dev/null
+++ b/metadata/md5-cache/sys-power/bbswitch-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
+EAPI=6
+HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
+IUSE=kernel_linux
+LICENSE=GPL-3+
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a0cb0915cbb63720fbc92f43cd8e97bb
diff --git a/metadata/md5-cache/virtual/rust-1.15.1 b/metadata/md5-cache/virtual/rust-1.15.1
new file mode 100644
index 000000000000..cb0a52ac9b0d
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.15.1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=6
+KEYWORDS=~amd64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.15.1* =dev-lang/rust-bin-1.15.1* )
+SLOT=0
+_md5_=2c4fb1691726464b05d4358d6b32e969
diff --git a/metadata/md5-cache/virtual/rust-1.16.0 b/metadata/md5-cache/virtual/rust-1.16.0
new file mode 100644
index 000000000000..987e402de6bb
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.16.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=6
+KEYWORDS=~amd64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.16.0* =dev-lang/rust-bin-1.16.0* )
+SLOT=0
+_md5_=2c4fb1691726464b05d4358d6b32e969
diff --git a/metadata/md5-cache/virtual/rust-1.19.0 b/metadata/md5-cache/virtual/rust-1.19.0
new file mode 100644
index 000000000000..2b971c5cc6d4
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.19.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=6
+KEYWORDS=~amd64 ~x86
+RDEPEND=|| ( =dev-lang/rust-1.19.0* =dev-lang/rust-bin-1.19.0* )
+SLOT=0
+_md5_=2c4fb1691726464b05d4358d6b32e969
diff --git a/metadata/md5-cache/www-client/opera-developer-48.0.2643.0 b/metadata/md5-cache/www-client/opera-developer-48.0.2664.0
similarity index 96%
rename from metadata/md5-cache/www-client/opera-developer-48.0.2643.0
rename to metadata/md5-cache/www-client/opera-developer-48.0.2664.0
index 3419735856ab..aa2abb271965 100644
--- a/metadata/md5-cache/www-client/opera-developer-48.0.2643.0
+++ b/metadata/md5-cache/www-client/opera-developer-48.0.2664.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/48.0.2643.0/linux/opera-developer_48.0.2643.0_amd64.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/48.0.2664.0/linux/opera-developer_48.0.2664.0_amd64.deb )
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=537cc5072d66518d2efb8b1c28d7fad0
diff --git a/metadata/md5-cache/www-client/seamonkey-2.48-r1 b/metadata/md5-cache/www-client/seamonkey-2.48-r1
new file mode 100644
index 000000000000..2f103e9b1418
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.48-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-plugins/enigmail ) jack? ( virtual/jack ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) crypt? ( dev-lang/perl ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) !gtk3? ( >=x11-libs/gtk+-2.18:2 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=6
+HOMEPAGE=http://www.seamonkey-project.org
+IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux +skia startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk3 wifi l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-plugins/enigmail ) jack? ( virtual/jack ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) !gtk3? ( >=x11-libs/gtk+-2.18:2 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=system-harfbuzz? ( system-icu )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.48/source/seamonkey-2.48.source.tar.xz -> seamonkey-2.48.source.tar.xz l10n_cs? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.cs.langpack.xpi -> seamonkey-2.48-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.de.langpack.xpi -> seamonkey-2.48-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.en-GB.langpack.xpi -> seamonkey-2.48-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-AR.langpack.xpi -> seamonkey-2.48-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-ES.langpack.xpi -> seamonkey-2.48-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.fr.langpack.xpi -> seamonkey-2.48-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.hu.langpack.xpi -> seamonkey-2.48-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.it.langpack.xpi -> seamonkey-2.48-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.ja.langpack.xpi -> seamonkey-2.48-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.lt.langpack.xpi -> seamonkey-2.48-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.nl.langpack.xpi -> seamonkey-2.48-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.pl.langpack.xpi -> seamonkey-2.48-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.pt-PT.langpack.xpi -> seamonkey-2.48-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.ru.langpack.xpi -> seamonkey-2.48-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.sk.langpack.xpi -> seamonkey-2.48-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.sv-SE.langpack.xpi -> seamonkey-2.48-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-CN.langpack.xpi -> seamonkey-2.48-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-TW.langpack.xpi -> seamonkey-2.48-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-51.0-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-51.0-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-51.0-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.51	0ce8629e0031b5c85b5768df327178a8	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e3c0b93bb284269205def793bf37bef5	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=45fad83204290053a93513d8cdc26b22
diff --git a/metadata/md5-cache/www-servers/puma-3.9.1 b/metadata/md5-cache/www-servers/puma-3.9.1
index 3dd0aa964f60..dbec035ea051 100644
--- a/metadata/md5-cache/www-servers/puma-3.9.1
+++ b/metadata/md5-cache/www-servers/puma-3.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 EAPI=6
 HOMEPAGE=http://puma.io/
 IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=BSD
 RDEPEND=dev-libs/openssl: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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v3.9.1.tar.gz -> puma-3.9.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=982b3024ce15e855212bbbda5bca5db3
+_md5_=2d55634c069f76f1d170bcd0aaed8f9d
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.59 b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.59
new file mode 100644
index 000000000000..b1129e76decf
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.59
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=6
+HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux abi_x86_32 abi_x86_64 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 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) 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(-)?] ) X? ( <x11-base/xorg-server-1.19.99:= >=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/libvdpau-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(-)?] 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(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror
+SLOT=0/384
+SRC_URI=amd64-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86_64/384.59/NVIDIA-FreeBSD-x86_64-384.59.tar.gz ) amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/384.59/NVIDIA-Linux-x86_64-384.59.run ) arm? ( http://http.download.nvidia.com/XFree86/Linux-32bit-ARM/384.59/NVIDIA-Linux-armv7l-gnueabihf-384.59.run ) x86-fbsd? ( http://http.download.nvidia.com/XFree86/FreeBSD-x86/384.59/NVIDIA-FreeBSD-x86-384.59.tar.gz ) x86? ( http://http.download.nvidia.com/XFree86/Linux-x86/384.59/NVIDIA-Linux-x86-384.59.run ) tools? ( https://github.com/NVIDIA/nvidia-settings/archive/384.59.tar.gz -> nvidia-settings-384.59.tar.gz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nvidia-driver	d49d68d8038f17c82f74beb68a753b74	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8911d4925805071b28fecfe33bff56c3
diff --git a/metadata/md5-cache/x11-misc/dunst-1.2.0 b/metadata/md5-cache/x11-misc/dunst-1.2.0
new file mode 100644
index 000000000000..101b8b476f13
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/dunst-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=customizable and lightweight notification-daemon
+EAPI=6
+HOMEPAGE=http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst
+IUSE=dunstify
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
+SLOT=0
+SRC_URI=https://github.com/dunst-project/dunst/archive/v1.2.0.tar.gz -> dunst-1.2.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=70cfbddb13cc8933f97d2821ea7564c7
diff --git a/metadata/md5-cache/x11-plugins/wmbutton-0.6.1 b/metadata/md5-cache/x11-plugins/wmbutton-0.6.1
deleted file mode 100644
index 461107f93db6..000000000000
--- a/metadata/md5-cache/x11-plugins/wmbutton-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext x11-proto/xextproto x11-proto/xproto dev-util/ctags
-DESCRIPTION=a dockapp application that displays nine configurable buttons
-EAPI=0
-HOMEPAGE=http://www.freshports.org/x11/wmbutton
-IUSE=branding
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
-SLOT=0
-SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/wmbutton-0.6.1.tar.gz branding? ( mirror://gentoo/wmbutton-buttons.xpm )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=a17f72ce783871648d6c234cddcb78d0
diff --git a/metadata/md5-cache/x11-plugins/wmbutton-0.7.1 b/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
new file mode 100644
index 000000000000..11d591ad3bf2
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext x11-proto/xproto
+DESCRIPTION=a dockapp application that displays nine configurable buttons
+EAPI=6
+HOMEPAGE=http://www.dockapps.net/wmbutton
+IUSE=branding
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
+SLOT=0
+SRC_URI=http://www.dockapps.net/download/wmbutton-0.7.1.tar.gz
+_md5_=43c54ae651cbf1f97dfca3293e6b7f6e
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.13.2 b/metadata/md5-cache/xfce-base/xfconf-4.13.3
similarity index 93%
rename from metadata/md5-cache/xfce-base/xfconf-4.13.2
rename to metadata/md5-cache/xfce-base/xfconf-4.13.3
index 27f09e45faa1..f9a51ea95c1d 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.13.2
+++ b/metadata/md5-cache/xfce-base/xfconf-4.13.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30:= >=xfce-base/libxfce4util-4.10:= perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl )
 SLOT=0/3
-SRC_URI=mirror://xfce/src/xfce/xfconf/4.13/xfconf-4.13.2.tar.bz2
+SRC_URI=mirror://xfce/src/xfce/xfconf/4.13/xfconf-4.13.3.tar.bz2
 _eclasses_=virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
 _md5_=c72be685a302acf992507a6051827f3c
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 938c3a8041c0..98d7c7ba8aa0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Jul 2017 20:39:28 +0000
+Tue, 25 Jul 2017 05:09:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e8be550146c1..ad2b3bfb505d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul 23 20:39:28 UTC 2017
+Tue Jul 25 05:09:08 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a17670de3f60..2ec127f761d4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Jul 2017 21:00:01 +0000
+Tue, 25 Jul 2017 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d23606282ca3..db62a89c3732 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9c921e89d51876fd876f250324893fd90c019326 1500838669 2017-07-23T19:37:49+00:00
+d8832637b6ec18adb00c8368ce3ea8d82b4ae06d 1500957965 2017-07-25T04:46:05+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f5be7edf2904..9d6be49294f2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1500842101 Sun 23 Jul 2017 08:35:01 PM UTC
+1500959101 Tue 25 Jul 2017 05:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 938c3a8041c0..98d7c7ba8aa0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 23 Jul 2017 20:39:28 +0000
+Tue, 25 Jul 2017 05:09:08 +0000
diff --git a/net-analyzer/icinga2/icinga2-2.6.3.ebuild b/net-analyzer/icinga2/icinga2-2.6.3-r1.ebuild
similarity index 99%
rename from net-analyzer/icinga2/icinga2-2.6.3.ebuild
rename to net-analyzer/icinga2/icinga2-2.6.3-r1.ebuild
index 263b81550667..5f0227d0451a 100644
--- a/net-analyzer/icinga2/icinga2-2.6.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.3-r1.ebuild
@@ -121,7 +121,6 @@ src_install() {
 	einstalldocs
 
 	newinitd "${FILESDIR}"/icinga2.initd icinga2
-	newconfd "${FILESDIR}"/icinga2.confd icinga2
 
 	if use mysql ; then
 		docinto schema
diff --git a/net-analyzer/suricata/suricata-3.2-r1.ebuild b/net-analyzer/suricata/suricata-3.2-r1.ebuild
index 419c56ac26d8..f6aa21dbcc46 100644
--- a/net-analyzer/suricata/suricata-3.2-r1.ebuild
+++ b/net-analyzer/suricata/suricata-3.2-r1.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test"
 
+REQUIRED_USE="lua? ( !luajit )"
+
 DEPEND="
 	>=dev-libs/jansson-2.2
 	dev-libs/libpcre
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 3c6cfe9dcf88..69b5f38afd70 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1 +1,2 @@
 DIST tcpdump-4.9.0.tar.gz 1260309 SHA256 eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e SHA512 e98d73ae706d42e96b4069e196cf17af892eb97935664eebd08779b55b4da858bc1732d714efd16924f862aad0ba5550ceb2213c68414ed48907c46456c9fc82 WHIRLPOOL bd2284919bd3a2af166c6e05254e6fb7fa757b76f269d1a4951fe0ccfb6ad282a50f5670d3f8a38f6bffd1834bc809effd2e8575f9f0dd2fd7eaa4b4fdce5552
+DIST tcpdump-4.9.1.tar.gz 1192832 SHA256 4d1a69eab083d5df91effb805024abd4406e8a592e98558ed8722ef160c58119 SHA512 82ff20ece4c197f4b0142e45227310dc513facc9668c1423cb402eb2b62a18909a172c432ee6b20c012c172d47752ef65e2747f9d93d335073ea0ce3c007f5c9 WHIRLPOOL ed59af89e0c67477db3f10bd2d8c2b9b2dc2b3c7e3906abe37b0eba5024084e93afa98b39690c1c3af94cc6a0955023ee01ccfc5547a454dafe952957807295f
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.1.ebuild
new file mode 100644
index 000000000000..a3be92f321f9
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.9.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/tcpdump
+"
+SRC_URI="
+	https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl samba suid test"
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	test? (
+		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+		dev-lang/perl
+	)
+"
+S=${WORKDIR}/${PN}-${P}
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_configure() {
+	if use drop-root; then
+		append-cppflags -DHAVE_CAP_NG_H
+		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+	fi
+
+	econf \
+		$(use_enable samba smb) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${EPREFIX}/usr") \
+		$(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_preinst() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 542af0ff1516..5aaabee62b7d 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,2 +1,3 @@
 DIST libidn2-0.16.tar.gz 1494295 SHA256 2fad9efff4082ae2143f69df76339ca99379e0e0f4231455f5d3d9d2089c688f SHA512 85f41c79bd2b88f2724383461a78e56b47e52e66e3f088d631a922438742938721d26aeebef17f6ca4fd028d95dfb5b0fa298a96982ef777c07fefe5244d1e73 WHIRLPOOL be10d0e2994e4fa0e31d710b358c7375e9454b4291bd4603a683a6ddb737241442007f04893395b36d7ef636614b6982354840bb07570e2a6b8f6aa2d888996a
 DIST libidn2-2.0.2.tar.gz 1925342 SHA256 8cd62828b2ab0171e0f35a302f3ad60c3a3fffb45733318b3a8205f9d187eeab SHA512 c8fd1114fc8df2030abf7c1044da4022989a1cd7ecd92309f62ad0b51b1fcf40418dccd2e397a8335c5e99998130f25339dcb576b4bc88888e3ef0df89714dad WHIRLPOOL fc60b6b8da20b60c851001788541ede0b7ce64ea9701a229b7312b748b02cf99f70d14070ffd64967f6b970f1ce43589956bad693d13f8b51ddde27515fd47c1
+DIST libidn2-2.0.3.tar.gz 1801001 SHA256 4335149ce7a5c615edb781574d38f658672780331064fb17354a10e11a5308cd SHA512 1a9f20ff1b57e69d78fe4c3e4b235bda41d6ce963f7604e3604c1164ec10d3e3069bcdf78cef820bf2e8bf481fd4ebae5571d4be66bece1b43d006e1acb7622b WHIRLPOOL c6724560569eb07e5209c0f4f03feeaae2fd8a3ba1a8071c8f636af03ae5f441ae426db02bef6cea119cb9b12d68550170e1b4e380aaa471f3f3987f248998bb
diff --git a/net-dns/libidn2/libidn2-2.0.3.ebuild b/net-dns/libidn2/libidn2-2.0.3.ebuild
new file mode 100644
index 000000000000..0830e44f1de0
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.0.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	sys-apps/help2man
+"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gtk-doc
+}
+
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 5be60d4c7515..a32bd14fc7b7 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,28 @@
 DIST shorewall-5.0.15.6.tar.bz2 525827 SHA256 17ae4613eac68a62d4cd520af8c63b54b36ae79aac4e22fc57c74929a968ef46 SHA512 d1665a30a9b1273e3cfdb7e8001a679beb3d09e75e8fd21caadcd528d3912cceca5525c6ef7c8191865e8e62d1abaa894480a403cc2e8ef6545301ca36f83b32 WHIRLPOOL 1e2e613de27e6caf449b8f3127526dc68971d08693b7235a7f504abc8cf2afcdda244f910b726e37e2554080830f13eb197424995a0a5155b73d5c538042ce5d
 DIST shorewall-5.1.4.4.tar.bz2 511611 SHA256 fe71c2a2efdc45b594ecc097115322c2203fe31b3098efa4023eff429ff2c55f SHA512 14c7a8cb750b37b72adba28ae00619d4e27fdc73801f1462705754ddbb47727d60425021018bdefdef6c373f2310a774569a88728125e52fd59cf10d94ee4aea WHIRLPOOL 0ef8b315f577c4c8612ad5f842dc8b5e3f4248445cda56136f733fc78d8217d6b5607ff9ed17d43cdd81109b3e493b640ce7bf7e9d33750eaff1cd0effac5c37
+DIST shorewall-5.1.5.1.tar.bz2 519694 SHA256 ef07733c45cbdde4a11b9ce1895f1aeeb36e69146282b8b943f6eda438694a8a SHA512 ab2f8a55c6f03cb4834c5914d77cdfa19cba30e23160533c423cf8f1425b5929df379ed12fee5630e52f2b869bc21111788bffdd2ef3c5937c2e8139ec311817 WHIRLPOOL 7b9dd3ec05f84faae2e9760afb1c70371655bc12c9479603836a8a5fed3c3979ec23421eba1117aaa51fedffb806eca7bcb82e8f615c88e56cd63ee80d405f7f
 DIST shorewall-5.1.5.tar.bz2 519297 SHA256 8604f07fcfde07afc6215988d47229a135d1a30da412974fda127af13aef3899 SHA512 54c02d34f3d79aa210ca18c99de5f51dc404b1104f0456dfc12d0917bcabb4bf76bd6ff98ba78ee36a7e35adfcc37c6bbe9d0c878a96f4380b0ab5b3e59946b6 WHIRLPOOL 9825cf31b1144cc1c47d7e6a6b1a75c3a897db122d2fd49039ac75a57db5aabc5575e4f838b3fe32247d83983ef20d124db4ff7f4e3efc3484ec83937bf6ae4b
 DIST shorewall-core-5.0.15.6.tar.bz2 65272 SHA256 6b1c461494922f207397ce2d9ed12b0a105d82ee3528a02a4448bc6c028623b8 SHA512 5e33ef55c4ca43a5c49747d5b3f40c9f43b0696e7084a6db56df73810551d216bd313860eb5354f50b1f9849c4d332f665e3f4832ff1cf3a9542bb6a43a73119 WHIRLPOOL 1b66e763e0d37b78b0343c8ad4964d46459347114bbebfeb965af075d73bbf71a8c695310f051f4160e5dd1cc7033e32545a5404538acce7d0452aa1618af4cd
 DIST shorewall-core-5.1.4.4.tar.bz2 76206 SHA256 e5fddd7f25b717bce6cc3a9e50d72cb172335d113c58aaef4496004297db6a13 SHA512 24a9a0176d3b1c3dede7428393b9e04a37329053fff95f15102a04d97fb95b30a11c7e0d550a457a29b07291c9347c9b96969ea1b03b68858b3e022f29fd908a WHIRLPOOL 1ff57177c352bd828a0f113267ea154ff5288eb83caa556b07fe85784de896e227f89bae47e7eaaecb76f1a2dbd0fdc87c95f20f8706ef480504a2c5cba0ad2b
+DIST shorewall-core-5.1.5.1.tar.bz2 77100 SHA256 8fe63431785ec1fa8c3ec5f9ba68647f4da9845168a84e410cf905804a6aae8a SHA512 9f3651bcccc84be172c12e27f7b352b706ed397c767e5092a76c45f705a7c53b5650e69eb810b4d00be2a7f37e9dd43f20748ba54a8ff868e84dddf2b3b8c965 WHIRLPOOL 47eaf747e2ffa7a7f81a948860ce3a65fafc17806abe29e2848bec426fcc55b20d9d4b1714f1561b82a8bd1c20996bf5166874b1ad1402a3765cc347b715e90f
 DIST shorewall-core-5.1.5.tar.bz2 76964 SHA256 7ad44b91342538e10be438a2e2bfc987789191865ff57c61bb24e35bdb6b8301 SHA512 b9e18f853187d8e382fe1993d7094cc2ca4e982d12bf765c7a521f7d45fe002a5456816787d27107b38be3b9091f8fc20e3f6e0d5844593673677835ab09b571 WHIRLPOOL 22c253d442c1d2f8dc35ca86988104b9838154c55ddf3ef6fee518209cbca2cf14276817192ea330bad7026d56dab1c7e957e8ebfdef7b98c3ff17637bfc4f4c
 DIST shorewall-docs-html-5.0.15.6.tar.bz2 4290931 SHA256 e6b253591fd9df7d00bf0bbcfd9c563f4248013119e13b22b34d947b244ce4e4 SHA512 e1304ea2b0e05645654b04ea825d255de70e02edc5f183dcf9eba88641aaeda8cd9781bf46a84b98628a7ed148bf1450e37e7871ef2a577e54ffd3707d7d85c3 WHIRLPOOL f1c038886f1428480c1f6b6be688717cee11717a8ae2b31ea35aef915245d2e46f7934e5bc0e54aaca7a9c83b0328cb3e96c949ed96730bada25896d85fbbf4a
 DIST shorewall-docs-html-5.1.4.4.tar.bz2 4280886 SHA256 892d704fe4b15b4f8fe5cd7bee8d456122bfc25f8d514d6efdb767b071e9991a SHA512 15c66e82c40de0a0edad798dc0acda45323160720d806a2759dd82816270e175a5891270b0198f1533f4092b8744629b3c8389f0093869a63d66af2a1d7ff9f1 WHIRLPOOL 20cf5de986eb07e0693671454904f87d2cbf4a66895029d94e96f3ed4d3ef312e69ce4ecbdd8fb876ef02b982803f6042848ed807ad4ee240eac67d4b6c64782
+DIST shorewall-docs-html-5.1.5.1.tar.bz2 4218521 SHA256 c9da6309e72c530af253e90c50fe994d338ab887bc3603a4a140c6c781d3e2a8 SHA512 30e1e3049c2992588d5d542962d4a7f6c97d1a5db1a5a6d0bf0e0c291108a0f01555c72cb336dc859d9446f5be38f86d7c83288151e689ac7d7423fb55ef36e3 WHIRLPOOL d17f0db967ee2d3138b691d2131051f2f20cf8637495509c7a22c4fed005a3cc2fe5dda4e2fc67b05f1e1d8546d55d78c6b17d5912d287e2eec8afe6422e86ad
 DIST shorewall-docs-html-5.1.5.tar.bz2 4210862 SHA256 a1b6c59edff3f0222ed7eafbfd0d8f7873caa06316d4a1c28174e133051b8640 SHA512 0635f57916a71a823ee9e05ac6099447af6e1aaab1c6478b9800d15cfc57a0928ceed17a3347037a7cf4bf02cec25af6089f7a6e201cc158affac272d70fbd93 WHIRLPOOL 3598986c4fe1c98cbe95bb829ff240dc92d69e9f8f3892ef49749681f53841b1d202abb39601ff0cc9231bb994ee654796f52a87b4c2bc0afad0d60ebc9f6f8b
 DIST shorewall-init-5.0.15.6.tar.bz2 42934 SHA256 c7afa1aff586186c4ce0cbe0f4e0fc06a84e936349f3dc69c84ef97c815fc6c1 SHA512 11c639b20992005e74ccd4aaa855a519fe6f96b030f171e91d68ec4ba1ca5ff5f73c6a1c823c5ffc88e3ad8e3cc2809dd24a91e0c892ab1f71d6c957113367e9 WHIRLPOOL c1190c31f5c2556fa7e73385856c8bbeb3b0cadb5ebed834e9b2138eee90059a864d85301095d3accdf537b6b4347cffe213d26c6a2201e040887647c65f4291
 DIST shorewall-init-5.1.4.4.tar.bz2 31258 SHA256 7ba1d2910fdb5dea4078aae96b469e228e20934e3637d6d3d7f6a5f89f535eb2 SHA512 b49bb7787a3c0a748af15d5d98b63beaaea4f4b8448e48b2064a10197a74d087107d6bdd70dcfd9211ddb2e58d6e97991591c2f617648b87401bc53f76e3a5ea WHIRLPOOL f0121eff5ff1fe6ad1a191a1a764925d8bc2ca6b847e3442f334190d048e6b8c38e42283b33d8e542321d3d606f0ba28b204ff31e49dce9fd4067abefd498a29
+DIST shorewall-init-5.1.5.1.tar.bz2 32356 SHA256 44d1fefb6884e61e18d047e7ab41f267722bf85bef2dff1c4e58118be5087a0f SHA512 4cc3d06ee200c2d6a2f34915315194ec8a8e795239b43b6dbe7f92c43f3725bc33f68eebc87943933e0031f56a65e50578927ad8c5507f498433159dcbdb89fd WHIRLPOOL de79be3d062b28d120c79570aa8496cc9613fa2825dca137a77349bf891d28d51e31c34707d61fa8f406818b73c85e382b3266a7f40a5ce5ca61abd982c1fe90
 DIST shorewall-init-5.1.5.tar.bz2 32080 SHA256 3b98742b38c5cd347e034c494d80a8b565406ceb3dee0df97a7c4ed30da30ea4 SHA512 ca4b4b04944401fdc7dfd257beefda001597d5e45e7b73b7eddb28fede558beba42cf65a71ffb65de4e8f46cb0391e7018634cc9af9cf3110f75791bd18443e8 WHIRLPOOL 6e22f543c422f97d34e51ef62e8619876326005216b12c967f65536485d3db71bd0288b7d4f5f9d9696b3806aef8767fcaff5ae5e4908d196b6a481e8bba874b
 DIST shorewall-lite-5.0.15.6.tar.bz2 59347 SHA256 393a2aea8fe8c9d43babaad969e00c80508900123d78a0433d3a3ac6470fd6a8 SHA512 e49f74bfa39d65fffca00657487bc4d8600d6330af0413d3b146ff9192769def1e3f66e181c02bf541d50b73e327ff4035f86fd4ded5a133fc02b84c958a4bbc WHIRLPOOL 85e25de97e5594ae41e2277f6a48500d14add389710c0727483a270b8d071dec2ef66c8d2633b96a34109b432c4025832cdb7c05c9eb4de4d8ac9aba755651e8
 DIST shorewall-lite-5.1.4.4.tar.bz2 37096 SHA256 38c956fa2ecbda9c625f8d511673158f70e126e11017b1945006ac2c6d66a3ba SHA512 d29a8676e1e117fca5fc1068bb180c88b5560535c46e6ae089a0f0646939cfe6c9c990ec02a35fd21ac62f8435a1e34f6bcbca8b09f7ef09c65a901d59bfe107 WHIRLPOOL 0d380427ce07f26f0882f8011391ca94f8db17137961595a920b241a7ba0529268cd1d96ec50be3204f4e2a6b46e1b29d21cb845551a61a66313d16f84ac8123
+DIST shorewall-lite-5.1.5.1.tar.bz2 38154 SHA256 071a981a66c87304ebdfce20a650516840663c7a4f9ae4017c6645d705cac943 SHA512 504c3f16014ce00efe180894904b00493cbcf6af9e350e881ea1f499bbedf425d9e20b88e7aa3496ba78339e85973849cb9f3b3671a01515adde512876594ef1 WHIRLPOOL dcc96a662c2eb68abb8c1e84589785bd5fffc98cd6b1a1991cf702a47734bf76582a8d590994b12fa580f6c522d9909d1c33872fde5b9b0ce9886d4828f0e9ac
 DIST shorewall-lite-5.1.5.tar.bz2 37871 SHA256 c15e4adc0cea595b90d82361d8d6c2f8e1ac843a3918e75d53c2e480f013cb1b SHA512 e40647f06e61a5bd87d36d3591ca872cfcb850defe1954375009d6a2207ad7e912b94b1b891ac105b08cc80fa01eaa6ce83aa58925a86b5eeb79226e5c9754c0 WHIRLPOOL 1dd49ecc36d057df10e0f34f148432519dc49945c841492c9c6242b53011dd78079b2fb3802672dbaaf124339ccf66401421aeba1b3ff176c35b137191351c1b
 DIST shorewall6-5.0.15.6.tar.bz2 240682 SHA256 1434b973e76ed75080aa1853986406a2346e57f0f21b094a2e1793a8b6bd7ee4 SHA512 26ea371bf40548ceda7bff786b790dd74e9a1a74a3745dcc683e7101ea5303eef87006116704d15aa688b0c40c0777c7732a7727fe714c71c8566b85ae4c560a WHIRLPOOL 92097d48bcd77ff814ab2ce9a0edb9514f2ec2e27725fd01492982ae9e4731e4366b6a5a10d903122ec7e0c43a4107d370b8f2ee11dc213a9ae78a19df6dd172
 DIST shorewall6-5.1.4.4.tar.bz2 224995 SHA256 17ffd91eab228766c8fae80d7087a7a229de62f2a7e93e71e22807b647e9165d SHA512 dbc73ca2805f022a06594192ecef35a33874e0099e306d7e1b052765a5bb2e1a51008f2e08f66d505b2b6e36d8f0da730ec77f1b625abae0403af88030d878ac WHIRLPOOL f91d1db40956ad289014ff7156b74246cf12504ff0b84f46ea641e06fc2d55c417357f2c812e78c48f3ea29a4635e408b20946ebcf6ce35a2bcd0de20128e212
+DIST shorewall6-5.1.5.1.tar.bz2 187735 SHA256 15199281e09623b2e196062a07c3789a17c6b034fef6cf9501480681113227ef SHA512 01864eac5aa48fd096b19ea7923a051d635d18aeda47feaee2ae586996b430290a6f6eeeb2de68d97826bbd156dcda43bf1eae75cd7e47e64441752cb33fee5e WHIRLPOOL e807bf48446ad4576fe3cf493a4aeb34ee0964bb768d70924422d302aa0480aba1d2cdce420cf94571433f0e404bb04651db421cd36f265af5ddca600190297e
 DIST shorewall6-5.1.5.tar.bz2 187203 SHA256 aac997b2e335ef8d5d041f2b2f791e4dc6abe537f7f009a7b2ac11aabf9391f2 SHA512 6876f7a2f9820152e6bd15fc77b36f6734b5bb39895059f29497c231840c3eff3b973cf9976f0a63483379309341f158dae9e007e8f6de4c6a12833ec37ffbba WHIRLPOOL d51b2bc37bba659c6789dda13541a8f8816cba8163f3173f0aba5ba11f35f13b2fe231ea8189dd927b88107c92425cb0a0625caaf50be91f1384ec357a5d24e0
 DIST shorewall6-lite-5.0.15.6.tar.bz2 58776 SHA256 1d693d3815bd0c2e4a9e7acad7be38ff2b354681da847a5ec4b8d87ca860378f SHA512 83cab85eda851e071eb004688b10a70811bd6f896c831e97713c48b322ee419ed9fc8ac7570b4faf567be317ca1d6f5c89c1e0da0e025a94abe39aa0f000e9ad WHIRLPOOL 842e02fe907854682b54343750df60b0e4c60613eca675d69c071c4d726a05d5d940c8283e9b718413520b3ccc11a01913dabba49189c41a61aa756645a401ae
 DIST shorewall6-lite-5.1.4.4.tar.bz2 36797 SHA256 2372bc0e9c6e253c1e4db82353d6e4eb4b2a4353a57834e00b775fad99c22af0 SHA512 a1b2ff1f509e6560a94cd5d4f7f3ae3aff456bf19720a5e967b5a609bab3aa2c15a0d5e5b9b9fd54e9e3a551eb6d2da57f993f87354909d045e8f8b31bc073c4 WHIRLPOOL db463165743c799776221d25148311404a687a79377ae5672c7e80d01e1854a3be6b20ebbc17b5d0abd2cd931116ca9a19dbd02249a33f36ef13b32d0a50c556
+DIST shorewall6-lite-5.1.5.1.tar.bz2 37868 SHA256 341493e5549edc90c6767afae295fd17ffa05889ce0dbf8624a9849ae636abb5 SHA512 5fff35a195d7d509a2a849525fb9947cbe613734637161818f0dce43c90bc5c2d357d52972e74dde2fe23757c49fcf1e6eff1bc39e31eab09bb929cf14871b30 WHIRLPOOL 590608a46ff4954bda7582ca69079b1ec68f6501b496e5f45f36d5fa64b37596d9ed8313977d8286586e8ba4d774048da5a624c2574b2e756ebe6d5d835132b4
 DIST shorewall6-lite-5.1.5.tar.bz2 37557 SHA256 3399b83da651904d34267512b8054ff9b336b6a9d666e0b26e9cbf84cedf509f SHA512 efe0fc9c6109a04d08ca81dec086d9e33f4b6c1476904c5749c472ff0bad8d7b5115713ae76ea29e226733a990db67b7f8ae3d87464c08fe4a913d28c5e027dd WHIRLPOOL 302a6298f9ad0b2dac79442e4b9a2c6e2be08d2c8de42bc3a594fc256ee292a13fa95604865023b3483a030ee4ee796439693f54c8aa9d83af0fb2b07ba56b8b
diff --git a/net-firewall/shorewall/shorewall-5.1.5.1.ebuild b/net-firewall/shorewall/shorewall-5.1.5.1.ebuild
new file mode 100644
index 000000000000..ea2ef11ce095
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.5.1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}" || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 4e1e6ff32ba0..46c18f23f067 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,6 +1,6 @@
 DIST tdesktop-1.1.10.tar.gz 16967625 SHA256 be4b867367fed2a09180edde913cb8bcd4201f86707b533e4b54e36bcc1a3214 SHA512 5b40cf494e7ca30e570c3abb1157718538bab64f0457bc73a0f85c7d79957a5699839a74da934bf3dc1683056b5686dddf536e310e1e21d0c64962523b491426 WHIRLPOOL 79ad90bfa967dbc56ade64150c784bf69f308138e000caf1f758616d55983618164a11c774ba2437f49cdbee63173a263949d798094e6d927ad32cee234da527
-DIST tdesktop-1.1.9.tar.gz 16960532 SHA256 954c7b05b569265ca4beb50ae3d47f12210fca484c7d56da58f9181d8ec4ce67 SHA512 cac579b94683c54e80edeff52ad81d63cc9d7e45d48c74dd88dd4ef8c61e0dbc3b0931189ed218419eeef4d11d6b508a7a6efb9fe20f38250c12fd983983afe5 WHIRLPOOL 4f48acbcf0e54fbe47b1cb1585688be521a6fdf275d6019289139de9d6eeda542bcaa6d37b0de0ebbc3eff78ba97f05897a2a70438a391aeac7d831b28b7e331
+DIST tdesktop-1.1.15.tar.gz 16982452 SHA256 f631117596ba6c424d2819921b2a5f336415d144664324c939f736cd201379dd SHA512 6423e02e7ce0eb1ccbe6072f1c6d8b5d336b1bb6b3171f93d8c1f57e5554aab8ce9c9b223ecbe5c3f71bb2520dd7cb0e0e5060698b27cb4ae33b977cebb69ebb WHIRLPOOL 4139a4a8db3ce8b400fa88bd600d5fad9e17003109b742839ef9e4414ff868d4c7d405e6a5c214b923f2622ab0d2ad63d65e0253dde5add90a2bdc94b5d1a4e3
 DIST tsetup.1.1.10.tar.xz 30054964 SHA256 9024a2e1df7eecb49ad503ffa9ea2d9ccc6729dac7600c1a13c255a7db09c39e SHA512 dd254b50b4d74dc7d9a3ed80bb99617a466a4d388de53d25c70f6772d3a8b805671986c1c79ba388ab4a1441b255846f01235aa43e3e4e3fc0278324011b3efb WHIRLPOOL e2cd1ed60a7129a2ecd6c0cd080412d2091970764277c13f1643865a158addf4641d1cd880fedf9de1d8698330307f0d8ce9aa309140712bb545699d9b1dd2d2
-DIST tsetup.1.1.9.tar.xz 30039836 SHA256 370cca056d32869045f8879dfd89045747bf9327d109618002d283ab586899a6 SHA512 5b942ccdf9317acca799287288099270bb9b2f198dc575f67d58ca9555a8c54270d3598d7078ceab072384a1f80d27a209b26da6ae12d8f462e581726a8a5724 WHIRLPOOL 0301846c16462a9d9f372d11685044e96947b923c43b4fa653f1e979adc0a186ed874eabef30f4317cc6949f47e2fee7ce963ba5eabf7f1573a905206ec53a24
+DIST tsetup.1.1.15.tar.xz 30121472 SHA256 92530e25098f7059ff33f794435daa3911aad7233867b92ff446d96cb8f57935 SHA512 2d5c959dcc817cf9eabdde4af8329695a0ea45575383544b9d7f33816610b473f609acea19bf3472ede54af993ae5798300925d7aee2a37e6910802cb096eb54 WHIRLPOOL aeede503183904b62a80a0c051acb01a8022cda2267a3fb9ebfb9ff7b282c8cd214bdb8630ec8416be6a4a40e218cf1aa5630ee6eac38138d92b1b8f7fad83e3
 DIST tsetup32.1.1.10.tar.xz 31001388 SHA256 4b751a34d3226994666c35e7760652451f29d7d83d88e02bc79da268cafc1432 SHA512 ef162dcd48ab1cb8345275e2e66036ee5b09c0a50e1b4b9ac58872b657ceddf0b6c9bc6a101bde64f327952d76feb8808816b0a279452ee9874ee3a35ec6fda2 WHIRLPOOL 63ad4919a70175310dda6a415a053ffa77508e6579c4e55b541065b34a76ba06a690d86a305dd8f9143226cd170816690e3d376beb1e3f47f2044238e9598ce4
-DIST tsetup32.1.1.9.tar.xz 30977868 SHA256 e77b4dd2b91a630c628a863a6a9fa001599621205a83604a5a3218e46719bd38 SHA512 62c8771a59792a0410916e3245cd1cff64b5e3061a5b3d81f5cf976f2c6f622805f1fc77920ab64a22f8b59554992286c06fba4e26f1a53899f6e097e85423ab WHIRLPOOL ac04440263023e247c0b5d8b8d1c88473df7f48e416a6d9cdbb2e742235048311d9a627eb0b051949475dee586109ea5da501ed2d2ff45a8c1352b61dcfb4fdf
+DIST tsetup32.1.1.15.tar.xz 31065984 SHA256 82ccab8ca71bc529800145f6d3f6f176b1aa5c9abcd4a509450b962069848758 SHA512 3d8fe6e55ec8be28cb8b1614b79257d2b0b88f8dad325f33021a9b242c15de989bf1494979b2ab46a78ad9a7c8472d4fd45bc64d42d4e0a2f62202c89e870b24 WHIRLPOOL 3d10c1a7ba83f436cbaf3dca0f0da0dd8b527ee29a3a1099f493ce15088fcb1266570cb4350337d96f104e688ebb08842fb9f542b64a7519c36455d82c76d2c6
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.9.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.15.ebuild
similarity index 100%
rename from net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.9.ebuild
rename to net-im/telegram-desktop-bin/telegram-desktop-bin-1.1.15.ebuild
diff --git a/net-irc/shadowircd/files/format-security.patch b/net-irc/shadowircd/files/format-security.patch
new file mode 100644
index 000000000000..bd6e26e28a59
--- /dev/null
+++ b/net-irc/shadowircd/files/format-security.patch
@@ -0,0 +1,384 @@
+From 6055fe3ee3b7b932e2a21160251fff0f0c6bcc39 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 24 Jul 2017 10:39:43 -0400
+Subject: [PATCH 1/1] Supply trivial format strings to fix format-security
+ warnings.
+
+This commit adds a trivial format string "%s" to a number of function
+calls that are otherwise missing them. This avoids GCC's
+format-security warnings, which cause compilation failures with
+-Werror=format-security.
+
+Gentoo-Bug: 520620
+---
+ bandb/bandb.c         |  2 +-
+ modules/core/m_kill.c |  4 ++--
+ modules/m_away.c      |  4 ++--
+ modules/m_challenge.c |  8 ++++----
+ modules/m_info.c      |  6 +++---
+ modules/m_map.c       |  4 ++--
+ modules/m_oper.c      |  6 +++---
+ modules/m_stats.c     | 22 +++++++++++-----------
+ src/chmode.c          |  4 ++--
+ src/parse.c           |  2 +-
+ src/s_auth.c          |  2 +-
+ src/sslproc.c         |  8 ++++----
+ 12 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/bandb/bandb.c b/bandb/bandb.c
+index 33166b1..2d272a1 100644
+--- a/bandb/bandb.c
++++ b/bandb/bandb.c
+@@ -289,7 +289,7 @@ db_error_cb(const char *errstr)
+ {
+ 	char buf[256];
+ 	rb_snprintf(buf, sizeof(buf), "! :%s", errstr);
+-	rb_helper_write(bandb_helper, buf);
++	rb_helper_write(bandb_helper, "%s", buf);
+ 	rb_sleep(2 << 30, 0);
+ 	exit(1);
+ }
+diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
+index 80df7df..2fa91da 100644
+--- a/modules/core/m_kill.c
++++ b/modules/core/m_kill.c
+@@ -97,7 +97,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 		if((target_p = get_history(user, (long) KILLCHASETIMELIMIT)) == NULL)
+ 		{
+ 			if (strchr(user, '.'))
+-				sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
++				sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
+ 			else
+ 				sendto_one_numeric(source_p, ERR_NOSUCHNICK,
+ 						   form_str(ERR_NOSUCHNICK), user);
+@@ -216,7 +216,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 
+ 	if(IsServer(target_p) || IsMe(target_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
++		sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
+ 		return 0;
+ 	}
+ 
+diff --git a/modules/m_away.c b/modules/m_away.c
+index 557371e..13c4c39 100644
+--- a/modules/m_away.c
++++ b/modules/m_away.c
+@@ -85,7 +85,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 			free_away(source_p);
+ 		}
+ 		if(MyConnect(source_p))
+-			sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
++			sendto_one_numeric(source_p, RPL_UNAWAY, "%s", form_str(RPL_UNAWAY));
+ 		return 0;
+ 	}
+ 
+@@ -99,7 +99,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 	}
+ 	
+ 	if(MyConnect(source_p))
+-		sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
++		sendto_one_numeric(source_p, RPL_NOWAWAY, "%s", form_str(RPL_NOWAWAY));
+ 
+ 	return 0;
+ }
+diff --git a/modules/m_challenge.c b/modules/m_challenge.c
+index 2066095..b8514c4 100644
+--- a/modules/m_challenge.c
++++ b/modules/m_challenge.c
+@@ -172,7 +172,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 
+ 		if(oper_p == NULL)
+ 		{
+-			sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++			sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 			ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
+ 			     source_p->localClient->opername, source_p->name,
+ 			     source_p->username, source_p->host,
+@@ -203,7 +203,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 
+ 	if(oper_p == NULL)
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
+ 		     parv[1], source_p->name,
+ 		     source_p->username, source_p->host, source_p->sockhost);
+@@ -223,7 +223,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 
+ 	if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED CHALLENGE (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
+ 		     parv[1], source_p->name, source_p->username, source_p->host,
+ 		     source_p->sockhost);
+@@ -241,7 +241,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 	{
+ 		if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
+ 		{
+-			sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++			sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 			ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
+ 			     parv[1], source_p->name,
+ 			     source_p->username, source_p->host, source_p->sockhost);
+diff --git a/modules/m_info.c b/modules/m_info.c
+index dd14294..bab156f 100644
+--- a/modules/m_info.c
++++ b/modules/m_info.c
+@@ -722,7 +722,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 		/* safe enough to give this on a local connect only */
+ 		sendto_one(source_p, form_str(RPL_LOAD2HI),
+ 			   me.name, source_p->name, "INFO");
+-		sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
++		sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
+ 		return 0;
+ 	}
+ 	else
+@@ -736,7 +736,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 	send_info_text(source_p);
+ 	send_birthdate_online_time(source_p);
+ 
+-	sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
++	sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
+ 	return 0;
+ }
+ 
+@@ -761,7 +761,7 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 
+ 		send_birthdate_online_time(source_p);
+ 
+-		sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
++		sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
+ 	}
+ 
+ 	return 0;
+diff --git a/modules/m_map.c b/modules/m_map.c
+index 7a45140..baadc86 100644
+--- a/modules/m_map.c
++++ b/modules/m_map.c
+@@ -59,7 +59,7 @@ m_map(struct Client *client_p, struct Client *source_p, int parc, const char *pa
+ 	}
+ 
+ 	dump_map(client_p, &me, buf);
+-	sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
++	sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
+ 	return 0;
+ }
+ 
+@@ -71,7 +71,7 @@ mo_map(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ {
+ 	dump_map(client_p, &me, buf);
+ 	scache_send_missing(client_p);
+-	sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
++	sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
+ 
+ 	return 0;
+ }
+diff --git a/modules/m_oper.c b/modules/m_oper.c
+index b403b28..af1e008 100644
+--- a/modules/m_oper.c
++++ b/modules/m_oper.c
+@@ -83,7 +83,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 
+ 	if(oper_p == NULL)
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
+ 		     name, source_p->name,
+ 		     source_p->username, source_p->host, source_p->sockhost);
+@@ -100,7 +100,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 
+ 	if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
+ 		     name, source_p->name,
+ 		     source_p->username, source_p->host, source_p->sockhost);
+@@ -118,7 +118,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 	{
+ 		if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
+ 		{
+-			sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++			sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 			ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
+ 			     name, source_p->name,
+ 			     source_p->username, source_p->host, source_p->sockhost);
+diff --git a/modules/m_stats.c b/modules/m_stats.c
+index dc826bc..51555b4 100644
+--- a/modules/m_stats.c
++++ b/modules/m_stats.c
+@@ -223,7 +223,7 @@ m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 			if(stats_cmd_table[i].need_oper && !IsOper(source_p))
+ 			{
+ 				sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
+-						   form_str (ERR_NOPRIVILEGES));
++						   "%s", form_str (ERR_NOPRIVILEGES));
+ 				break;
+ 			}
+ 			if(stats_cmd_table[i].need_admin && !IsOperAdmin(source_p))
+@@ -285,7 +285,7 @@ stats_connect(struct Client *source_p)
+ 	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
+ 	    !IsOper(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str(ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -487,7 +487,7 @@ stats_hubleaf(struct Client *source_p)
+ 	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
+ 	    !IsOper(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -513,7 +513,7 @@ stats_auth (struct Client *source_p)
+ {
+ 	/* Oper only, if unopered, return ERR_NOPRIVS */
+ 	if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOper (source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 
+ 	/* If unopered, Only return matching auth blocks */
+@@ -556,7 +556,7 @@ stats_tklines(struct Client *source_p)
+ {
+ 	/* Oper only, if unopered, return ERR_NOPRIVS */
+ 	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 
+ 	/* If unopered, Only return matching klines */
+@@ -621,7 +621,7 @@ stats_klines(struct Client *source_p)
+ {
+ 	/* Oper only, if unopered, return ERR_NOPRIVS */
+ 	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 
+ 	/* If unopered, Only return matching klines */
+@@ -689,7 +689,7 @@ stats_oper(struct Client *source_p)
+ 
+ 	if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -752,7 +752,7 @@ static void
+ stats_ports (struct Client *source_p)
+ {
+ 	if(!IsOper (source_p) && ConfigFileEntry.stats_P_oper_only)
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 	else
+ 		show_ports (source_p);
+@@ -1063,7 +1063,7 @@ stats_servers (struct Client *source_p)
+ 	if(ConfigServerHide.flatten_links && !IsOper(source_p) &&
+ 	   !IsExemptShide(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -1137,7 +1137,7 @@ static void
+ stats_class(struct Client *source_p)
+ {
+ 	if(ConfigFileEntry.stats_y_oper_only && !IsOper(source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 	else
+ 		report_classes(source_p);
+@@ -1411,7 +1411,7 @@ stats_servlinks (struct Client *source_p)
+ 	if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
+ 	   !IsExemptShide(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+diff --git a/src/chmode.c b/src/chmode.c
+index 0a43199..cd649d3 100644
+--- a/src/chmode.c
++++ b/src/chmode.c
+@@ -644,7 +644,7 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
+ 	if(!IsOper(source_p) && !IsServer(source_p))
+ 	{
+ 		if(!(*errors & SM_ERR_NOPRIVS))
+-			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
++			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
+ 		*errors |= SM_ERR_NOPRIVS;
+ 		return;
+ 	}
+@@ -734,7 +734,7 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
+ 	if(!IsOper(source_p) && !IsServer(source_p))
+ 	{
+ 		if(!(*errors & SM_ERR_NOPRIVS))
+-			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
++			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
+ 		*errors |= SM_ERR_NOPRIVS;
+ 		return;
+ 	}
+diff --git a/src/parse.c b/src/parse.c
+index a8ce091..9e17de4 100644
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -719,7 +719,7 @@ static void do_alias(struct alias_entry *aptr, struct Client *source_p, char *te
+ int
+ m_not_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ {
+-	sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
++	sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
+ 	return 0;
+ }
+ 
+diff --git a/src/s_auth.c b/src/s_auth.c
+index 2644ff1..52e4633 100644
+--- a/src/s_auth.c
++++ b/src/s_auth.c
+@@ -116,7 +116,7 @@ typedef enum
+ }
+ ReportType;
+ 
+-#define sendheader(c, r) sendto_one_notice(c, HeaderMessages[(r)]) 
++#define sendheader(c, r) sendto_one_notice(c, "%s", HeaderMessages[(r)]) 
+ 
+ static rb_dlink_list auth_poll_list;
+ static rb_bh *auth_heap;
+diff --git a/src/sslproc.c b/src/sslproc.c
+index 11fadbb..51078fb 100644
+--- a/src/sslproc.c
++++ b/src/sslproc.c
+@@ -455,13 +455,13 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
+ 			break;
+ 		case 'I':
+ 			ssl_ok = 0;
+-			ilog(L_MAIN, cannot_setup_ssl);
+-			sendto_realops_snomask(SNO_GENERAL, L_ALL, cannot_setup_ssl);
++			ilog(L_MAIN, "%s", cannot_setup_ssl);
++			sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
+ 		case 'U':
+ 			zlib_ok = 0;
+ 			ssl_ok = 0;
+-			ilog(L_MAIN, no_ssl_or_zlib);
+-			sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
++			ilog(L_MAIN, "%s", no_ssl_or_zlib);
++			sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
+ 			ssl_killall();
+ 			break;
+ 		case 'z':
+-- 
+2.13.0
+
diff --git a/net-irc/shadowircd/files/shadowircd.initd-r1 b/net-irc/shadowircd/files/shadowircd.initd-r1
new file mode 100644
index 000000000000..38ccab8b3f3f
--- /dev/null
+++ b/net-irc/shadowircd/files/shadowircd.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/shadowircd-ircd"
+command_args="${SHADOWIRCD_OPTS}"
+command_user="shadowircd"
+extra_started_commands="reload"
+pidfile="/run/shadowircd/ircd.pid"
+
+depend() {
+	use dns net
+	provide ircd
+}
+
+start_pre() {
+    ebegin "Creating /run/shadowircd for ${SVCNAME}"
+    checkpath --directory --owner :shadowircd --mode 0770 /run/shadowircd
+    eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild b/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
new file mode 100644
index 000000000000..12883e6195db
--- /dev/null
+++ b/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="An IRCd based on charybdis that adds several useful features"
+HOMEPAGE="http://shadowircd.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +ipv6 largenet ssl zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=( "${FILESDIR}/format-security.patch" )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${EPREFIX}"/usr ${PN}
+}
+
+src_prepare() {
+	default
+
+	# Fill the example configuration file with proper paths.
+	sed -i \
+		-e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
+		-e "s:etc/:../etc/${PN}/:g" \
+		-e "s:logs/:../var/log/shadowircd/:g" \
+		-e "s:test\.\(cert\|key\):ssl.\1:g" \
+		doc/example.conf \
+		doc/reference.conf \
+		|| die
+}
+
+src_configure() {
+	econf \
+		ac_cv_prog_cc_g=no \
+		--disable-gnutls \
+		$(use_enable debug assert soft) \
+		$(use_enable debug iodebug) \
+		$(use_enable ipv6) \
+		$(use_enable !largenet small-net) \
+		$(use_enable ssl openssl) \
+		$(use_enable zlib) \
+		--with-program-prefix=shadowircd- \
+		\
+		--enable-fhs-paths \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--libdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-moduledir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--with-rundir="${EPREFIX}"/run
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto etc/${PN}
+	newins doc/reference.conf ircd.conf
+
+	keepdir var/{lib,log}/${PN}
+
+	# The runtime directory will be created by the init script, so we
+	# kill this here to avoid a QA warning about it.
+	rm -rf "${D}"/run || die
+
+	# shadowircd needs writing to its state (bandb) and log directories
+	fowners :shadowircd /var/{lib,log}/${PN}
+	fperms 770 /var/{lib,log}/${PN}
+
+	# ensure that shadowircd can access but not modify its configuration
+	# while protecting it from others
+	fowners :shadowircd /etc/${PN}{,/ircd.conf}
+	fperms 750 /etc/${PN}
+	fperms 640 /etc/${PN}/ircd.conf
+}
+
+pkg_postinst() {
+	elog "All of the shadowircd binaries in PATH have been prefixed with"
+	elog "'shadowircd-' to prevent file collisions."
+}
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
index 627cda0361c8..aa178a8332e7 100644
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 	http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
 	test? ( ${GTEST_URL} )
 "
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 arm ~x86"
 
 HOMEPAGE="http://znc.in"
 LICENSE="Apache-2.0"
diff --git a/net-libs/liboping/liboping-1.10.0.ebuild b/net-libs/liboping/liboping-1.10.0.ebuild
index b7f333154627..f091b4b58f2d 100644
--- a/net-libs/liboping/liboping-1.10.0.ebuild
+++ b/net-libs/liboping/liboping-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://noping.cc/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/0.3"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 arm ~x86"
 IUSE="+filecaps ncurses perl"
 
 DEPEND="ncurses? ( sys-libs/ncurses:0= )"
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 6ab6f7f36ff3..f3657364ffad 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,6 +1,2 @@
-DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de174497a8e436091541221dd71833da SHA512 9c338a9e376c845ae5f273030263dbae52fa268350d943e65987d6840d9647194f715e36517c829be32200f1064e13a585bd5b2acb9fa2a7f32199bd4be31459 WHIRLPOOL fa7bc71f0f17f789ed0dc1dce953e1399f56c7529d13a10761f90a3b40a210e511722dda99a502fa2ef8f74ccc6ea5e8c3392c408bf00a85b5824bfa96fc7f24
-DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1
-DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e
-DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d
 DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092
-DIST openvswitch-2.7.0.tar.gz 6149523 SHA256 e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e SHA512 d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 WHIRLPOOL 0c26e4488bfd3bea97415d9b4b00c87730bb35c2c059f3aff2fb0f7d3e34eed6308a4734ab88395dc435bd670ef584d89af9849d0cf6ea9dfe78168329e098cd
+DIST openvswitch-2.7.2.tar.gz 6192414 SHA256 fe36c86ed52f6f7c17b01cdbb7ae37bf521cc5c2e50997b618f3f742485f655b SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 WHIRLPOOL 6525d475cc10b3e32d5b9c01cbfd909dff3cfad28bbe13bf55b5775471a58fd49e9f9cf484a9e68a0f371c56824910142513c34dc5d2f11a0dcebf5b789e75d4
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index 75bd0ce821ac..cd4755d9fd44 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/metadata.xml
@@ -13,6 +13,5 @@
 	</maintainer>
 	<use>
 		<flag name="monitor">Build the Python and GUI dependent monitor applications</flag>
-		<flag name="pyside">Use <pkg>dev-python/pyside</pkg> instead of <pkg>dev-python/PyQt4</pkg> for Python/Qt-bindings when building with USE=monitor.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/openvswitch/openvswitch-1.11.0.ebuild b/net-misc/openvswitch/openvswitch-1.11.0.ebuild
deleted file mode 100644
index 645196094140..000000000000
--- a/net-misc/openvswitch/openvswitch-1.11.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-info linux-mod python-single-r1
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug modules monitor +pyside +ssl"
-REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-apps/openrc-0.10.5
-	ssl? ( dev-libs/openssl:0= )
-	monitor? (
-		${PYTHON_DEPS}
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-		dev-python/twisted-conch[${PYTHON_USEDEP}]
-		dev-python/twisted-web[${PYTHON_USEDEP}]
-		pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )
-		!pyside? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
-		dev-python/zope-interface[${PYTHON_USEDEP}] )
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		linux-mod_pkg_setup
-		kernel_is ge 2 6 18 || die "Linux >=2.6.18 and <3.2.9 required"
-		kernel_is lt 3 9 || die "Linux >=2.6.18 and <3.9 required"
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-	use monitor && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-}
-src_configure() {
-	set_arch_to_kernel
-	use monitor || export ovs_cv_python="no"
-	use pyside || export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KERNEL_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use monitor && python_fix_shebang \
-		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
-		utilities/bugtool/ovs-bugtool \
-		ovsdb/ovsdbmonitor/ovsdbmonitor
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	if use monitor ; then
-		python_domodule "${ED}"/usr/share/openvswitch/python/*
-		rm -r "${ED}/usr/share/openvswitch/python"
-		python_optimize "${ED}/usr/share/ovsdbmonitor"
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED}/var/run"
-	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
-	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
-
-	newconfd "${FILESDIR}/ovsdb-server_conf" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-	newinitd "${FILESDIR}/ovs-controller-r1" ovs-controller
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EPREFIX}/var/lib/openvswitch/conf.db"
-	if [ -e "${db}" ] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		"${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild b/net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild
deleted file mode 100644
index 518b284b1d3c..000000000000
--- a/net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-info linux-mod python-single-r1 systemd autotools
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-apps/openrc-0.10.5
-	ssl? ( dev-libs/openssl:0= )
-	monitor? (
-		${PYTHON_DEPS}
-		dev-python/twisted-core
-		dev-python/twisted-conch
-		dev-python/twisted-web
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}] )
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 2 6 32 || die "Linux >=2.6.32 and <3.10 required"
-		kernel_is lt 3 14 || die "Linux >=2.6.18 and <3.14 required"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-	use monitor && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	epatch "${FILESDIR}/prevent-traceback.patch"
-	epatch "${FILESDIR}/kernel-3.11-support.patch"
-	epatch "${FILESDIR}/xcp-interface-reconfigure.patch"
-#	epatch "${FILESDIR}/atomic-test.patch"
-	epatch "${FILESDIR}/kernel-3.12-support.patch"
-	epatch "${FILESDIR}/configure.patch"
-	eautoreconf
-}
-src_configure() {
-	set_arch_to_kernel
-	use monitor || export ovs_cv_python="no"
-	#pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use monitor && python_fix_shebang \
-		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
-		utilities/bugtool/ovs-bugtool \
-		ovsdb/ovsdbmonitor/ovsdbmonitor
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	if use monitor ; then
-		python_domodule "${ED}"/usr/share/openvswitch/python/*
-		rm -r "${ED}/usr/share/openvswitch/python"
-		python_optimize "${ED}/usr/share/ovsdbmonitor"
-	fi
-	# not working without the brcompat_mod kernel module which did not get
-	# included in the kernel and we can't build it anymore
-	rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8"
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED}/var/run"
-	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
-	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-	newinitd "${FILESDIR}/ovs-controller-r1" ovs-controller
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_dounit "${FILESDIR}/ovs-controller.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EPREFIX}/var/lib/openvswitch/conf.db"
-	if [ -e "${db}" ] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		"${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.1.3.ebuild b/net-misc/openvswitch/openvswitch-2.1.3.ebuild
deleted file mode 100644
index 2b86eb940e48..000000000000
--- a/net-misc/openvswitch/openvswitch-2.1.3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-info linux-mod python-single-r1 systemd autotools
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-apps/openrc-0.10.5
-	ssl? ( dev-libs/openssl:0= )
-	monitor? (
-		${PYTHON_DEPS}
-		dev-python/twisted-core
-		dev-python/twisted-conch
-		dev-python/twisted-web
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}] )
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 3.12 required for userspace modules"
-		kernel_is lt 3 12 || die "Linux >= 2.6.32 and <= 3.12 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-	use monitor && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	epatch "${FILESDIR}/xcp-interface-reconfigure.patch"
-	epatch "${FILESDIR}/kernel-3.12-support.patch"
-	eautoreconf
-}
-src_configure() {
-	set_arch_to_kernel
-	use monitor || export ovs_cv_python="no"
-	#pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use monitor && python_fix_shebang \
-		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
-		utilities/bugtool/ovs-bugtool
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	if use monitor ; then
-		python_domodule "${ED}"/usr/share/openvswitch/python/*
-		rm -r "${ED}/usr/share/openvswitch/python"
-		python_optimize "${ED}/usr/share/ovsdbmonitor"
-	fi
-	# not working without the brcompat_mod kernel module which did not get
-	# included in the kernel and we can't build it anymore
-	rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8"
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED}/var/run"
-	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
-	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EPREFIX}/var/lib/openvswitch/conf.db"
-	if [ -e "${db}" ] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		"${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.5.0.ebuild b/net-misc/openvswitch/openvswitch-2.5.0.ebuild
deleted file mode 100644
index 7515af50a0e7..000000000000
--- a/net-misc/openvswitch/openvswitch-2.5.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-info linux-mod python-single-r1 systemd autotools
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	|| (
-		>=sys-apps/openrc-0.10.5
-		sys-apps/systemd
-	)
-	ssl? ( dev-libs/openssl:0= )
-	monitor? (
-		${PYTHON_DEPS}
-		dev-python/twisted-core
-		dev-python/twisted-conch
-		dev-python/twisted-web
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}] )
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 4.3 required for userspace modules"
-		kernel_is le 4 3 999 || die "Linux >= 2.6.32 and <= 4.3 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-	use monitor && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	epatch "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-	eautoreconf
-}
-src_configure() {
-	set_arch_to_kernel
-	use monitor || export ovs_cv_python="no"
-	#pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	PYTHON=python2.7 econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-#	use monitor && python_fix_shebang \
-#		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
-#		utilities/bugtool/ovs-bugtool
-	if use monitor; then
-		sed -i \
-			's/^#\!\ python2\.7/#\!\/usr\/bin\/env\ python2\.7/' \
-			utilities/ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} \
-			utilities/bugtool/ovs-bugtool || die "sed died :("
-	fi
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	if use monitor ; then
-		python_domodule "${ED}"/usr/share/openvswitch/python/*
-		rm -r "${ED}/usr/share/openvswitch/python"
-		python_optimize "${ED}/usr/share/ovsdbmonitor"
-	fi
-	# not working without the brcompat_mod kernel module which did not get
-	# included in the kernel and we can't build it anymore
-	rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8"
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED}/var/run"
-	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
-	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EPREFIX}/var/lib/openvswitch/conf.db"
-	if [ -e "${db}" ] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		"${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild
deleted file mode 100644
index 98903f09b296..000000000000
--- a/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		>=sys-apps/openrc-0.10.5
-		sys-apps/systemd
-	)
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-${PV}[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch ${FILESDIR}/doc-fix.patch"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild
deleted file mode 100644
index a3809b7fa0ea..000000000000
--- a/net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		>=sys-apps/openrc-0.10.5
-		sys-apps/systemd
-	)
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-${PV}[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch ${FILESDIR}/doc-fix.patch"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	epatch "${FILESDIR}/CVE-2017-9214.patch"
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.7.0.ebuild b/net-misc/openvswitch/openvswitch-2.7.0.ebuild
deleted file mode 100644
index cdac856c6f75..000000000000
--- a/net-misc/openvswitch/openvswitch-2.7.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		>=sys-apps/openrc-0.10.5
-		sys-apps/systemd
-	)
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-${PV}[${PYTHON_USEDEP}]
-	dev-python/twisted-core
-	dev-python/twisted-conch
-	dev-python/twisted-web
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_dounit "${FILESDIR}/ovsdb-server.service"
-	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.0 ${pv} ; then
-			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
-			ewarn "    /etc/openvswitch"
-			ewarn "to"
-			ewarn "    /var/lib/openvswitch"
-			ewarn "Please copy/move the database manually before running the schema upgrade."
-			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
-		fi
-	done
-
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild
similarity index 98%
rename from net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild
rename to net-misc/openvswitch/openvswitch-2.7.2.ebuild
index ff4706e31abe..596a2985f9c7 100644
--- a/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -24,7 +24,7 @@ RDEPEND="
 	)
 	ssl? ( dev-libs/openssl:0= )
 	${PYTHON_DEPS}
-	~dev-python/ovs-${PV}[${PYTHON_USEDEP}]
+	~dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
 	dev-python/twisted[conch,${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	debug? ( dev-lang/perl )"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7856b53d2dd0..2eb29c9fc31d 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.07.02.tar.gz 2740061 SHA256 5b8b11c932ddbc346e2188f0e3a4c0ab8203b1b749f8ea9b212e10d34fa20168 SHA512 08cf4693450ad9ecdad653d4e5508c0899a54e3e16f49f5957ee1ff1486f55333860c3b8ea0d45a1ec12bf5cdc4ce3f57abf9f6c1eb73eca1dd41a38e86bbe68 WHIRLPOOL f28898208dfe3230284f7e6803cb4002a0bd7f493bbc5826ae0ad76ee4453cb5c7413cfc9609fa7bb1131754a07415318e1c380e04a07bba4ff9c88ba1517915
 DIST youtube-dl-2017.07.15.tar.gz 2752839 SHA256 665905606b61cad2f4ac945823722c3bf951f3003f5a24506aea690f4189b5ca SHA512 372ac27be349fb10ce21249d7d455cec291c1691b78a67f20ae425cb5c146226ee278e97fc5903a5fd6df6dca8e0cd09da8377f606b93633161bc02ba239f573 WHIRLPOOL dc8db12f3d69ebe6bc1a8ed3fe3f7c53c2ab987ad56d683726c22eb03fe3f8829bc73a4986ef978c88252071d386fa0132d2d467c14215d5d395413411994f11
+DIST youtube-dl-2017.07.23.tar.gz 2758874 SHA256 950068234d9af63168bf1c53961638b78766d5f83f227d1e3f699d8e4f8d1241 SHA512 3e64db2b7aa3316ab4bd6745123b3411c9b3a6d06912d233254452ac47d5c4b7906b5b5d5afd7311fd0101ab7a43213dbd013c489d8c88dae4556a1fa2ce18ae WHIRLPOOL 117a5ebec345e2f4baef8f0fb410ba371d744d6657c1de02a02ff2b96affa33950e74cea334f0f664070857753c61ff770544ffd1704c6b38bc42d946b7613be
diff --git a/net-misc/youtube-dl/youtube-dl-2017.07.02.ebuild b/net-misc/youtube-dl/youtube-dl-2017.07.23.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2017.07.02.ebuild
rename to net-misc/youtube-dl/youtube-dl-2017.07.23.ebuild
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
similarity index 96%
rename from net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild
rename to net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
index b5c33b4c51d6..df49b8e4e32a 100644
--- a/net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
@@ -56,7 +56,8 @@ PATCHES=( "${FILESDIR}/noninteractive-build.patch")
 src_install () {
 	distutils-r1_src_install
 	dodoc README.md
-	doman man/pybitmessage.1.gz
+
+	# The man page is not installed because it's basically empty.
 
 	if use qt4 ; then
 		newicon -s 24 desktop/icon24.png "${PN}.png"
diff --git a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
index 7a4749f5289d..50c87f4224cb 100644
--- a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
+++ b/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/khvzak/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/dbus-glib
diff --git a/profiles/package.mask b/profiles/package.mask
index 1b112d2e5b91..f32968812e4b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,40 @@
 
 #--- END OF EXAMPLES ---
 
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Dropped from upstream tarball for years, removal in a month (#626106)
+gnustep-apps/clipbook
+
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Dead upstream, last release 13 years ago, removal in a month (#626106)
+gnustep-apps/displaycalibrator
+
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Segfaults on diffs, last release 8 years ago, removal in a month (#626106)
+gnustep-apps/easydiff
+
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Dead upstream, last release 11 years ago, removal in a month (#626106)
+gnustep-apps/remotedesk
+
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Crashes on startup with current gnustep packages, removal in a month (#626106)
+gnustep-apps/sudoku
+
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Dead upstream, nothing in tree depends on it, removal in a month (#626106)
+gnustep-libs/camerakit
+
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Dead upstream, nothing in tree depends on it, removal in a month (#626106)
+gnustep-libs/iconkit
+
+# Bernard Cafarelli <voyageur@gentoo.org> (25 Jul 2017)
+# Dead upstream, last code update 11 years ago, removal in a month (#626106)
+# Use gnustep-apps/systempreferences instead
+gnustep-apps/preferences
+gnustep-libs/prefsmodule
+
 # Kent Fredric <kentnl@gentoo.org> (21 Jul 2017)
 # Masked due to serious regression that introduces widespread data
 # corruption when storing data in blobs. Masked, because any code
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8439010a1e9b..b04e861427bf 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6433,7 +6433,6 @@ net-misc/openssh:livecd - Enable root password logins for live-cd environment.
 net-misc/openssh:ssh1 - Support the legacy/weak SSH1 protocol
 net-misc/openssh:ssl - Enable additional crypto algorithms via OpenSSL
 net-misc/openvswitch:monitor - Build the Python and GUI dependent monitor applications
-net-misc/openvswitch:pyside - Use dev-python/pyside instead of dev-python/PyQt4 for Python/Qt-bindings when building with USE=monitor.
 net-misc/owncloud-client:dolphin - Install the kde-apps/dolphin extension
 net-misc/owncloud-client:nautilus - Install the gnome-base/nautilus extension
 net-misc/owncloud-client:sftp - Enable sftp transfer support via net-libs/libssh
@@ -7168,6 +7167,8 @@ sci-libs/netcdf:dap - Support for remote data access with the built-in OPeNDAP c
 sci-libs/netcdf:hdf - Add support for the Hierarchical Data Format v.4 sci-libs/hdf
 sci-libs/netcdf:tools - Build the utilities nccopy, ncgen and ncdump
 sci-libs/nlopt:octave - Add plugin for sci-mathematics/octave
+sci-libs/o2scl:armadillo - Build matrix manipulation with sci-libs/armadillo
+sci-libs/o2scl:eigen - Build matrix manipulation with dev-cpp/eigen
 sci-libs/octomap:dynamicEDT3D - Build and install dynamicEDT3D library: A library for incrementally updatable Euclidean distance transforms in 3D.
 sci-libs/opencascade:freeimage - Enable support for image i/o via media-libs/freeimage
 sci-libs/opencascade:gl2ps - Use gl2ps PostScript printing library
@@ -7630,6 +7631,7 @@ sys-block/fio:numa - Enable numa support
 sys-block/fio:rbd - Enable Rados block device support via sys-cluster/ceph
 sys-block/fio:rdma - Enable infiniband support via sys-fabric/librdmacm
 sys-block/gparted:btrfs - Include Btrfs support (sys-fs/btrfs-progs)
+sys-block/gparted:cryptsetup - Include LUKS volume support (sys-fs/cryptsetup)
 sys-block/gparted:dmraid - Support for dmraid devices, also known as ATA-RAID, or Fake RAID.
 sys-block/gparted:f2fs - Include F2FS support (sys-fs/f2fs-tools)
 sys-block/gparted:fat - Include FAT16/FAT32 support (sys-fs/dosfstools)
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 23509da06a0e..04f53fced369 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,2 +1,3 @@
 DIST mpir-2.6.0.tar.lzma 2472231 SHA256 2d2cd75a21a73bcd8898f092e4f123016b578288d7c7eab2df05df5e1921695f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d WHIRLPOOL 4759be848778fc4f34e87083e83e3697bfb57b9c9360ab69666afadc1b2652285a3c2a4c14321d9091ed90d0df307e89e34875a7592e24c2e405453a0b6f6e06
 DIST mpir-2.7.2.tar.bz2 3771429 SHA256 a7d4c33595b4f781a51c92d5d139ec2efb3cf1bf101dfc3eef5b40c54e6f45ec SHA512 8436a0123201f9e30130ea340331c5a6445dddb58ce1f6c6a3a8303c310ac5b3c279c83b5c520a757cba82c2b14e92da44583e0eec287090cf69cbb29d516a9c WHIRLPOOL 8c7804b183282b7d804e91233176ce948a2e5e5c83dcefc4eaf31194a59431af55002a8b6a3405ddb45cac89270066c3c0ae2c4adcaa22329f4af06dbdf10ffb
+DIST mpir-3.0.0.tar.bz2 2572041 SHA256 52f63459cf3f9478859de29e00357f004050ead70b45913f2c2269d9708675bb SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e WHIRLPOOL 7f10d08291f3a47db2d02d1db63fde8a187bd6896d42dfdd45ec9d77dafa35199b87871c53abbd43b22f78f2948e202402100c67f78f73c60a0692e5bdb49753
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
new file mode 100644
index 000000000000..14bfad90ba26
--- /dev/null
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)"
+HOMEPAGE="http://www.mpir.org/"
+SRC_URI="http://www.mpir.org/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0/23"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx cpudetection static-libs"
+
+DEPEND="
+	x86? ( dev-lang/yasm )
+	amd64? ( dev-lang/yasm )
+"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.2-ABI-multilib.patch
+)
+
+src_prepare() {
+	tc-export CC
+	default
+	# In the same way there was QA regarding executable stacks
+	# with GMP we have some here as well. We cannot apply the
+	# GMP solution as yasm is used, at least on x86/amd64.
+	# Furthermore we are able to patch config.ac.
+	ebegin "Patching assembler files to remove executable sections"
+	local i
+	for i in $(find . -type f -name '*.asm') ; do
+		cat >> $i <<-EOF
+
+			#if defined(__linux__) && defined(__ELF__)
+			.section .note.GNU-stack,"",%progbits
+			#endif
+		EOF
+	done
+
+	for i in $(find . -type f -name '*.as') ; do
+		cat >> $i <<-EOF
+
+			%ifidn __OUTPUT_FORMAT__,elf
+			section .note.GNU-stack noalloc noexec nowrite progbits
+			%endif
+		EOF
+	done
+	eend
+	eautoreconf
+}
+
+src_configure() {
+	# beware that cpudetection aka fat binaries is x86/amd64 only.
+	# Place mpir in profiles/arch/$arch/package.use.mask
+	# when making it available on $arch.
+	local myeconfargs+=(
+		$(use_enable cxx)
+		$(use_enable cpudetection fat)
+		$(use_enable static-libs static)
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*la
+}
diff --git a/sci-libs/o2scl/Manifest b/sci-libs/o2scl/Manifest
new file mode 100644
index 000000000000..5a647c87404f
--- /dev/null
+++ b/sci-libs/o2scl/Manifest
@@ -0,0 +1 @@
+DIST o2scl-0.920.tar.gz 34498666 SHA256 dd08c0cb0ab13b9d63ae0cc83f026f69076166877a76661aa5059b7cce29e712 SHA512 a80c959b76d15473e206f1caac496607af254f0617f7a18d13bd9732861b6c51f5db8ca3ff6866bb8d0ea70865d4ac94cb972e0a0c158f19034667340341467c WHIRLPOOL 625548dd5c954d2227627f6ae0b04ccb81ba55948e5f0b5a8315b491ef45a2648b62c062aadc5c0689ce2c2c404996132d33f3ad924c1a1e5ed68c95554d40dc
diff --git a/sci-libs/o2scl/metadata.xml b/sci-libs/o2scl/metadata.xml
new file mode 100644
index 000000000000..12a668d82eb1
--- /dev/null
+++ b/sci-libs/o2scl/metadata.xml
@@ -0,0 +1,22 @@
+<?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">
+  O2scl is a C++ class library for object-oriented numerical
+  programming. It includes classes based on numerical routines from
+  GSL and CERNLIB and two sub-libraries: thermodynamics of ideal and
+  nearly-ideal particles with quantum statistics and e quations of
+  state for finite density relevant for neutron stars.
+  </longdescription>
+  <use>
+    <flag name="armadillo">Build matrix manipulation with <pkg>sci-libs/armadillo</pkg></flag>    
+    <flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">awsteiner/o2scl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/o2scl/o2scl-0.920.ebuild b/sci-libs/o2scl/o2scl-0.920.ebuild
new file mode 100644
index 000000000000..bf2fa4a38a83
--- /dev/null
+++ b/sci-libs/o2scl/o2scl-0.920.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Object-oriented Scientific Computing Library"
+HOMEPAGE="http://web.utk.edu/~asteine1/o2scl"
+SRC_URI="https://github.com/awsteiner/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="armadillo debug doc examples eigen fftw gsl hdf5 openmp readline static-libs"
+
+RDEPEND="
+	dev-libs/boost:0=
+	>=sci-libs/gsl-2:0=
+	virtual/cblas:=
+	eigen? ( dev-cpp/eigen:3 )
+	armadillo? ( sci-libs/armadillo[lapack] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && ! tc-check-openmp; then
+		ewarn "OpenMP is not available in your current selected compiler"
+		die "need openmp capable compiler"
+	fi
+}
+
+src_configure() {
+	use debug || append-cppflags -DO2SCL_NO_RANGE_CHECK
+	econf \
+		--enable-acol \
+		$(use_enable armadillo) \
+		$(use_enable eigen) \
+		$(use_enable fftw) \
+		$(use_enable gsl gsl2) \
+		$(use_enable hdf5 hdf) \
+		$(use_enable hdf5 partlib) \
+		$(use_enable hdf5 eoslib) \
+		$(use_enable openmp) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+	rm -r "${ED}"/usr/doc || die
+	if use doc; then
+		dodoc -r doc/o2scl/html
+		docompress -x /usr/share/doc/${PF}/html
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/pgplot/files/pgplot-compile-setup.patch b/sci-libs/pgplot/files/pgplot-compile-setup.patch
index f1709c333f4f..a5baef6a4d22 100644
--- a/sci-libs/pgplot/files/pgplot-compile-setup.patch
+++ b/sci-libs/pgplot/files/pgplot-compile-setup.patch
@@ -1,5 +1,5 @@
---- sys_linux/g77_gcc.conf.orig	1999-07-05 19:10:33.000000000 +0100
-+++ sys_linux/g77_gcc.conf	2008-10-29 18:30:33.000000000 +0000
+--- a/sys_linux/g77_gcc.conf.orig	1999-07-05 19:10:33.000000000 +0100
++++ b/sys_linux/g77_gcc.conf	2008-10-29 18:30:33.000000000 +0000
 @@ -1,4 +1,4 @@
 -# The GNU g77 FORTRAN compiler and Gnu gcc C compiler on an elf-system.
 +# The GNU gfortran FORTRAN compiler and Gnu gcc C compiler on an elf-system.
diff --git a/sci-libs/pgplot/files/pgplot-drivers.patch b/sci-libs/pgplot/files/pgplot-drivers.patch
index 8201bdfaeb70..c03d7508fc38 100644
--- a/sci-libs/pgplot/files/pgplot-drivers.patch
+++ b/sci-libs/pgplot/files/pgplot-drivers.patch
@@ -1,5 +1,5 @@
---- drivers.list.orig	2007-03-08 15:56:20.000000000 +0000
-+++ drivers.list	2007-03-08 15:59:21.000000000 +0000
+--- a/drivers.list	2007-03-08 15:56:20.000000000 +0000
++++ b/drivers.list	2007-03-08 15:59:21.000000000 +0000
 @@ -6,71 +6,71 @@
  !------------------------------------------------------------------------------
  ! File       Code       Description                                Restrictions
diff --git a/sci-libs/pgplot/files/pgplot-headers.patch b/sci-libs/pgplot/files/pgplot-headers.patch
index 7bde726a041a..c05ca702648e 100644
--- a/sci-libs/pgplot/files/pgplot-headers.patch
+++ b/sci-libs/pgplot/files/pgplot-headers.patch
@@ -1,5 +1,5 @@
---- ./sys/grtermio.c.orig	2008-10-29 17:42:48.000000000 +0000
-+++ ./sys/grtermio.c	2008-10-29 19:54:43.000000000 +0000
+--- a/sys/grtermio.c	2008-10-29 17:42:48.000000000 +0000
++++ b/sys/grtermio.c	2008-10-29 19:54:43.000000000 +0000
 @@ -7,6 +7,10 @@
  
  #include <stdio.h>
@@ -11,8 +11,8 @@
  
  #ifdef PG_PPU
  #define GROTER groter_
---- ./sys/grfileio.c.orig	2008-10-29 15:10:02.000000000 +0000
-+++ ./sys/grfileio.c	2008-10-29 17:56:50.000000000 +0000
+--- a/sys/grfileio.c	2008-10-29 15:10:02.000000000 +0000
++++ b/sys/grfileio.c	2008-10-29 17:56:50.000000000 +0000
 @@ -17,7 +17,9 @@
   */
  
@@ -23,8 +23,8 @@
  #include <sys/types.h>
  #include <fcntl.h>
  
---- ./drivers/figdisp_comm.c.orig	2008-10-29 15:09:15.000000000 +0000
-+++ ./drivers/figdisp_comm.c	2008-10-29 17:54:08.000000000 +0000
+--- a/drivers/figdisp_comm.c	2008-10-29 15:09:15.000000000 +0000
++++ b/drivers/figdisp_comm.c	2008-10-29 17:54:08.000000000 +0000
 @@ -17,6 +17,8 @@
  
  /* The system include files */
@@ -34,8 +34,8 @@
  
  /* Get ntohs prototype or macro */
  
---- ./pgdispd/resdb.c.orig	2008-10-29 18:22:41.000000000 +0000
-+++ ./pgdispd/resdb.c	2008-10-29 20:10:22.000000000 +0000
+--- a/pgdispd/resdb.c	2008-10-29 18:22:41.000000000 +0000
++++ b/pgdispd/resdb.c	2008-10-29 20:10:22.000000000 +0000
 @@ -47,6 +47,8 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -53,8 +53,8 @@
  	extern struct passwd *getpwuid();
  	struct passwd *pw;
  	register char *ptr;
---- ./pgdispd/proccom.c.orig	2008-10-29 15:03:34.000000000 +0000
-+++ ./pgdispd/proccom.c	2008-10-29 18:15:48.000000000 +0000
+--- a/pgdispd/proccom.c	2008-10-29 15:03:34.000000000 +0000
++++ b/pgdispd/proccom.c	2008-10-29 18:15:48.000000000 +0000
 @@ -90,6 +90,7 @@
  
  /* The system include files */
@@ -71,8 +71,8 @@
  
  	if (!len & savedshorts)
  	{ /* an incomplete command was sent! */
---- ./pgdispd/getvisuals.c.orig	2008-10-29 17:59:37.000000000 +0000
-+++ ./pgdispd/getvisuals.c	2008-10-29 18:00:18.000000000 +0000
+--- a/pgdispd/getvisuals.c	2008-10-29 17:59:37.000000000 +0000
++++ b/pgdispd/getvisuals.c	2008-10-29 18:00:18.000000000 +0000
 @@ -30,6 +30,7 @@
  #include "messages.h"
  
@@ -81,8 +81,8 @@
  
  #define MAX_DEPTH	24	/* the maximum visual depth to use */
  
---- ./pgdispd/figcurs.c.orig	2008-10-29 17:58:22.000000000 +0000
-+++ ./pgdispd/figcurs.c	2008-10-29 18:14:02.000000000 +0000
+--- a/pgdispd/figcurs.c	2008-10-29 17:58:22.000000000 +0000
++++ b/pgdispd/figcurs.c	2008-10-29 18:14:02.000000000 +0000
 @@ -19,6 +19,7 @@
  
  /* The standard include files */
diff --git a/sci-libs/pgplot/files/pgplot-libpng15.patch b/sci-libs/pgplot/files/pgplot-libpng15.patch
index b1064cb4da12..a3cefe1dde77 100644
--- a/sci-libs/pgplot/files/pgplot-libpng15.patch
+++ b/sci-libs/pgplot/files/pgplot-libpng15.patch
@@ -1,5 +1,5 @@
---- drivers/pndriv.c
-+++ drivers/pndriv.c
+--- a/drivers/pndriv.c
++++ b/drivers/pndriv.c
 @@ -222,7 +222,7 @@
  	return;
    }
diff --git a/sci-libs/pgplot/files/pgplot-makemake.patch b/sci-libs/pgplot/files/pgplot-makemake.patch
index 6cc3c637b6ef..fafd2f16ea40 100644
--- a/sci-libs/pgplot/files/pgplot-makemake.patch
+++ b/sci-libs/pgplot/files/pgplot-makemake.patch
@@ -1,5 +1,5 @@
---- makemake.orig	2012-07-05 14:08:30.210815190 -0700
-+++ makemake	2012-07-05 14:26:28.353381906 -0700
+--- a/makemake	2012-07-05 14:08:30.210815190 -0700
++++ b/makemake	2012-07-05 14:26:28.353381906 -0700
 @@ -73,7 +73,7 @@
  
  # List the default make targets.
@@ -28,7 +28,7 @@
  if (echo $DRIV_LIST | grep -s tkdriv 2>&1 1>/dev/null); then
 -  DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a pgtkdemo pgtkdemo.tcl"
 -  INSTALL_LIST="$INSTALL_LIST libtkpgplot.a tkpgplot.h"
-+  DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.so"
++  DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a"
 +  INSTALL_LIST="$INSTALL_LIST libtkpgplot.a tkpgplot.h"
  fi
  
diff --git a/sci-libs/pgplot/files/pgplot-tk86.patch b/sci-libs/pgplot/files/pgplot-tk86.patch
index bc0023eb90d2..3223dc0dac4b 100644
--- a/sci-libs/pgplot/files/pgplot-tk86.patch
+++ b/sci-libs/pgplot/files/pgplot-tk86.patch
@@ -1,5 +1,5 @@
---- drivers/xtk/tkpgplot.c.ORIG	2000-12-13 03:16:28.000000000 +0100
-+++ drivers/xtk/tkpgplot.c	2013-01-15 11:02:27.221231471 +0100
+--- a/drivers/xtk/tkpgplot.c	2000-12-13 03:16:28.000000000 +0100
++++ b/drivers/xtk/tkpgplot.c	2013-01-15 11:02:27.221231471 +0100
 @@ -417,7 +417,7 @@
  /*
   * If Tk_Init() hasn't been called, then there won't be a main window
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
new file mode 100644
index 000000000000..793ce9da5939
--- /dev/null
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils fortran-2 toolchain-funcs
+
+MY_P="${PN}${PV//.}"
+
+DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
+HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
+SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc motif static-libs tk"
+
+RDEPEND="
+	media-libs/libpng:=
+	x11-libs/libX11:=
+	x11-libs/libXt:=
+	motif? ( x11-libs/motif:= )
+	tk? ( dev-lang/tk:= )"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-drivers.patch
+	"${FILESDIR}"/${PN}-makemake.patch
+	"${FILESDIR}"/${PN}-compile-setup.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-libpng15.patch
+	"${FILESDIR}"/${PN}-tk86.patch
+)
+
+src_prepare() {
+	default
+	# gfortran < 4.3 does not compile gif, pp and wd drivers
+	if [[ $(tc-getFC) == *gfortran* ]] &&
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
+		ewarn "Warning!"
+		ewarn "gfortran < 4.3 selected: does not compile all drivers"
+		ewarn "disabling gif, wd, and ppd drivers"
+		ewarn "if you want more drivers, use gfortran >= 4.3"
+		sed -e 's/GIDRIV/! GIDRIV/g' \
+			-e 's/PPDRIV/! GIDRIV/g' \
+			-e 's/WDDRIV/! GIDRIV/g' \
+			-i drivers.list || die "sed drivers failed"
+	fi
+
+	# fix pointers for 64 bits
+	if use amd64 || use ia64; then
+		sed -e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \
+			-i drivers/{gi,pp,wd}driv.f || die "sed 64bits failed"
+	fi
+
+	cp sys_linux/g77_gcc.conf local.conf
+
+	sed -e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \
+		-e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
+		-i local.conf || die "sed flags failed"
+
+	if [[ "$(tc-getFC)" = if* ]]; then
+		sed -e 's/-Wall//g' \
+			-e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \
+			-i local.conf || die "sed drivers failed"
+	fi
+
+	sed -e "s:/usr/local/pgplot:${EPREFIX}/usr/$(get_libdir)/pgplot:g" \
+		-e "s:/usr/local/bin:${EPREFIX}/usr/bin:g" \
+		-i src/grgfil.f makehtml maketex || die "sed path failed"
+
+	use motif && sed -i -e '/XMDRIV/s/!//' drivers.list
+	use tk && sed -i -e '/TKDRIV/s/!//' drivers.list
+}
+
+src_configure() {
+	./makemake . linux
+	# post makefile creation prefix hack
+	sed -i -e "s|/usr|${EPREFIX}/usr|g" makefile || die
+}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS} -fPIC" \
+		FFLAGS="${FFLAGS} -fPIC" \
+		shared cpg-shared pgxwin_server pgdisp pgplot.doc
+
+	use tk && emake CFLAGS="${CFLAGS} -fPIC" libtkpgplot.so
+	use motif && emake CFLAGS="${CFLAGS} -fPIC" libXmPgplot.so
+
+	emake -j1 clean
+	use static-libs && emake all cpg
+
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
+		emake pgplot.html pgplot-routines.tex
+		pdflatex pgplot-routines.tex
+		pdflatex pgplot-routines.tex
+	fi
+
+	# this just cleans out not needed files
+	emake -j1 clean
+}
+
+src_test() {
+	# i can go to 16
+	local i j
+	for i in 1 2 3; do
+		emake pgdemo${i}
+		# j can also be LATEX CPS...
+		for j in NULL PNG PS CPS LATEX; do
+			local testexe=./test_${j}_${i}
+			echo "LD_LIBRARY_PATH=. ./pgdemo${i} <<EOF" > ${testexe}
+			echo "/${j}" >> ${testexe}
+			echo "EOF" >> ${testexe}
+			sh ${testexe} || die "test ${i} failed"
+		done
+	done
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/pgplot
+	doins grfont.dat grexec.f *.inc rgb.txt
+	echo "PGPLOT_FONT=${EPREFIX%/}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot
+	doenvd 99pgplot
+
+	dolib.so libpgplot.so*
+	dobin pgxwin_server pgdisp
+
+	# C binding
+	insinto /usr/include
+	doins cpgplot.h
+	dolib.so libcpgplot.so*
+
+	if use motif; then
+		insinto /usr/include
+		doins XmPgplot.h
+		dolib.so libXmPgplot.so*
+	fi
+
+	if use tk; then
+		insinto /usr/include
+		doins tkpgplot.h
+		dolib.so libtkpgplot.so*
+	fi
+
+	use static-libs && dolib.a lib*pgplot.a
+
+	# minimal doc
+	dodoc aaaread.me pgplot.doc
+	newdoc pgdispd/aaaread.me pgdispd.txt
+
+	if use doc; then
+		dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc pgplot.html
+		dodoc pgplot-routines.pdf pgplot-routines.tex
+		insinto /usr/share/doc/${PF}/examples
+		doins  examples/* cpg/cpgdemo.c
+		insinto /usr/share/doc/${PF}/applications
+		doins -r applications/*
+		if use motif; then
+			insinto /usr/share/doc/${PF}/pgm
+			doins pgmf/* drivers/xmotif/pgmdemo.c
+		fi
+		if use tk; then
+			insinto /usr/share/doc/${PF}/pgtk
+			doins drivers/xtk/pgtkdemo.*
+		fi
+	fi
+}
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index c7992773634d..f742b19bb984 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -30,6 +30,7 @@ DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f651
 DIST rstudio-0.99.903.tar.gz 17409865 SHA256 8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739 WHIRLPOOL 82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69
 DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 SHA512 cb4f98834f287267925169c8141bd0f95fd23cefdba8f407f76a24617bc40da56430745f112774838345330b9f99b9cac86d5b99517346a019e8e2cb3b01f713 WHIRLPOOL 5932ef2572670951a094f79e8805215fd50c3643b4a4654cb469d7181708a3327763531cb68e968e64ebdb7b44df03da0c18f9a06a12d968e908bedc43dac52f
 DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda
+DIST rstudio-1.0.153.tar.gz 17790922 SHA256 79b90e21e56b114e28b03fd8543a208c55bb9d5f47a87fd29143d08b9a06f7a0 SHA512 d970a9bde88845e3fc6cdaff5233ffb65c03939c685c3fca0dd052246e065c7580b3f9bc4e053a79d2ecbb5f8c283d3fce7b97cc69e43176bd49587c736dab86 WHIRLPOOL c1f4c7bdc8e5a85af53411a35d736278b83f4732d2e273378fecc77cb075dff507147d56012682564edd58041c91cc051189eb38a7348d0827b76c7ac37bd54d
 DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
diff --git a/sci-mathematics/rstudio/rstudio-1.0.153.ebuild b/sci-mathematics/rstudio/rstudio-1.0.153.ebuild
new file mode 100644
index 000000000000..dcb101cac4e3
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.0.153.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.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-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.7.0
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-1.0.44-paths.patch"
+		"${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v0.99.903
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 1d31e4c46940..ff5975b1fa2e 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1 +1,2 @@
 DIST gparted-0.27.0.tar.gz 3377303 SHA256 208cf60c061b86bee4f658d568a3b5d843dce3ab9847f66b452298268799e7bd SHA512 0a44697e6d34d1ca3d3fc65fb90ec945ff3807cd208bf18fb118b73980e018b6d69fa515f4f1b199974eabb36b977c541f141790fe640e083ff14c2bbd578e5f WHIRLPOOL ec823c78deb342ba448ebc956b9758e0fca6f405f7f9b03b7039ac63f3add1dd7a9b139eddc8787c4eb85f9b9222d9b5e99d04b62e70f157fa86e6b582f56e3f
+DIST gparted-0.28.1.tar.gz 3444521 SHA256 76891f14394754f7d6ecceba2af0e585bf89f9d780c389a255dcd41a2f45d333 SHA512 533adc9c2896063532f109ee6ee5fd1e1f510f47aad4ed2b673fc74ba2406f1f8d86db8096965920608028ce255385e04a60926bbf771f7df96100c3e0546a67 WHIRLPOOL b3b5fd08c2bcfba690ea34bd5d1c24f119451eeee3e191641a7cd4a8c31a343c2c8b7b56d029942cf1f79b2a0aee2e300bacb720d03d492167d9ee9a5505dacb
diff --git a/sys-block/gparted/gparted-0.28.1.ebuild b/sys-block/gparted/gparted-0.28.1.ebuild
new file mode 100644
index 000000000000..77807ab932d0
--- /dev/null
+++ b/sys-block/gparted/gparted-0.28.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Gnome Partition Editor"
+HOMEPAGE="http://gparted.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.14:2
+	>=dev-cpp/gtkmm-2.22:2.4
+	>=dev-libs/glib-2:2
+	>=sys-block/parted-3.2:=
+"
+RDEPEND="${COMMON_DEPEND}
+	!policykit? (
+		kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
+	policykit? ( sys-auth/polkit )
+
+	>=sys-apps/util-linux-2.20
+	>=sys-fs/e2fsprogs-1.41
+	btrfs? ( sys-fs/btrfs-progs )
+	cryptsetup? ( sys-fs/cryptsetup )
+	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 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-doc \
+		--enable-online-resize \
+		GKSUPROG=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+
+	local _ddir="${D}"/usr/share/applications
+
+	if use policykit; then
+		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
+		insinto /usr/share/polkit-1/actions/
+		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
+		dobin "${FILESDIR}"/gparted-pkexec
+	else
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop
+			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
+		fi
+	fi
+}
diff --git a/sys-block/gparted/metadata.xml b/sys-block/gparted/metadata.xml
index 6d179d3500a5..d8d52d2b7f6d 100644
--- a/sys-block/gparted/metadata.xml
+++ b/sys-block/gparted/metadata.xml
@@ -11,19 +11,20 @@
 	<longdescription lang="en">
 	GParted is the Gnome Partition Editor. It can create, grow, shrink, move and
 	copy various filesystems.
-</longdescription>
+	</longdescription>
 	<longdescription lang="fr">
 	GParted est l'éditeur de partition de Gnome. Il peut créer, redimensionner,
 	déplacer et copier différents systèmes de fichiers.
-</longdescription>
+	</longdescription>
 	<use>
 		<flag name="btrfs">Include Btrfs support (<pkg>sys-fs/btrfs-progs</pkg>)</flag>
+		<flag name="cryptsetup">Include LUKS volume support (<pkg>sys-fs/cryptsetup</pkg>)</flag>
 		<flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or
 		Fake RAID.</flag>
 		<flag name="f2fs">Include F2FS support (<pkg>sys-fs/f2fs-tools</pkg>)
-	</flag>
+		</flag>
 		<flag name="fat">Include FAT16/FAT32 support (<pkg>sys-fs/dosfstools</pkg>)
-	</flag>
+		</flag>
 		<flag name="hfs">Include HFS support (<pkg>sys-fs/hfsutils</pkg>)</flag>
 		<flag name="jfs">Include JFS support (<pkg>sys-fs/jfsutils</pkg>)</flag>
 		<flag name="mdadm">Support for Linux software RAID.</flag>
@@ -37,5 +38,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gparted</remote-id>
+		<remote-id type="cpe">cpe:/a:gparted:gparted</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/clang-runtime/clang-runtime-5.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-5.0.9999.ebuild
new file mode 100644
index 000000000000..f95b5ba93135
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-5.0.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+# Note: keep it matching clang-9999 version
+SLOT="5.0.0"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
+
+REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild
new file mode 100644
index 000000000000..df33aa3a8b7a
--- /dev/null
+++ b/sys-devel/clang/clang-5.0.9999.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic git-r3 llvm multilib-minimal \
+	python-single-r1 toolchain-funcs pax-utils versionator
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_50"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="$(get_major_version)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx +doc multitarget
+	+static-analyzer test xml z3 elibc_musl kernel_FreeBSD
+	${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? (
+		dev-lang/perl:*
+		z3? ( sci-mathematics/z3:0= )
+	)
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	xml? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( sys-libs/libcxx )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )
+	multitarget? ( ${ALL_LLVM_TARGETS[*]} )"
+
+# We need extra level of indirection for CLANG_RESOURCE_DIR
+S=${WORKDIR}/x/y/${P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	# create extra parent dir for CLANG_RESOURCE_DIR
+	mkdir -p x/y || die
+	cd x/y || die
+
+	git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
+		https://github.com/llvm-mirror/clang-tools-extra.git"
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
+		"${S}"/tools/extra
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm
+	fi
+	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+}
+
+src_prepare() {
+	# fix finding compiler-rt libs
+	eapply "${FILESDIR}"/9999/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+
+	# fix stand-alone doc build
+	eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
+
+	# User patches
+	eapply_user
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(get_version_component_range 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		# ensure that the correct llvm-config is used
+		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+		# z3 is not multilib-friendly
+		-DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
+		-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+		)
+		use doc && mycmakeargs+=(
+			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-clang
+	multilib_is_native_abi && cmake-utils_src_make check-clang-tools
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(get_version_component_range 1-2 "${llvm_version}")
+	local clang_full_version=$(get_version_component_range 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X.Y
+	# - clang -> clang-X.Y
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X.Y
+	# - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 7fa988fd6b48..57378c25ed3f 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -24,7 +24,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx +doc multitarget
 	+static-analyzer test xml z3 elibc_musl kernel_FreeBSD
diff --git a/sys-devel/lld/lld-5.0.9999.ebuild b/sys-devel/lld/lld-5.0.9999.ebuild
new file mode 100644
index 000000000000..6c2601f5d423
--- /dev/null
+++ b/sys-devel/lld/lld-5.0.9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/lld.git
+	https://github.com/llvm-mirror/lld.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm
+	fi
+	git-r3_checkout
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		# TODO: fix detecting pthread upstream in stand-alone build
+		-DPTHREAD_LIB='-lpthread'
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lld
+}
diff --git a/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild
new file mode 100644
index 000000000000..239d0e083cd5
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+src_configure() { :; }
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r utils/vim/*/
+	# some users may find it useful
+	newdoc utils/vim/README README.vim
+	dodoc utils/vim/vimrc
+}
diff --git a/sys-devel/llvm/llvm-5.0.9999.ebuild b/sys-devel/llvm/llvm-5.0.9999.ebuild
new file mode 100644
index 000000000000..66aa02b23cc3
--- /dev/null
+++ b/sys-devel/llvm/llvm-5.0.9999.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic git-r3 multilib-minimal pax-utils \
+	python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_50"
+
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. ARM backend: LLVM Software Grant by ARM.
+# 3. MD5 code: public-domain.
+# 4. Tests (not installed):
+#  a. gtest: BSD.
+#  b. YAML tests: MIT.
+
+LICENSE="UoI-NCSA rc BSD public-domain
+	llvm_targets_ARM? ( LLVM-Grant )"
+SLOT="$(get_major_version)"
+KEYWORDS=""
+IUSE="debug +doc gold libedit +libffi ncurses test
+	elibc_musl kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+	sys-libs/zlib:0=
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
+	kernel_Darwin? ( <sys-libs/libcxx-$(get_version_component_range 1-3).9999 )
+	doc? ( dev-python/sphinx )
+	gold? ( sys-libs/binutils-libs )
+	libffi? ( virtual/pkgconfig )
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( sys-devel/llvmgold )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	! use test \
+		|| has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# support building llvm against musl-libc
+	use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# User patches
+	eapply_user
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	cat <<-_EOF_ > "${T}/10llvm-${revord}" || die
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+_EOF_
+	doenvd "${T}/10llvm-${revord}"
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index adc0505a80ae..d5e7da2b5015 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="debug +doc gold libedit +libffi ncurses test
 	elibc_musl kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
diff --git a/sys-devel/llvmgold/llvmgold-6.ebuild b/sys-devel/llvmgold/llvmgold-6.ebuild
new file mode 100644
index 000000000000..6e0663ca9db8
--- /dev/null
+++ b/sys-devel/llvmgold/llvmgold-6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="LLVMgold plugin symlink for autoloading"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="sys-devel/llvm:${PV}[gold]
+	!sys-devel/llvm:0"
+
+S=${WORKDIR}
+
+src_install() {
+	dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+	dosym "../../../../lib/llvm/${PV}/$(get_libdir)/LLVMgold.so" \
+		"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
+}
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
index def2a354ef5b..0357b8839f5e 100644
--- a/sys-kernel/dracut/dracut-045-r2.ebuild
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://dracut.wiki.kernel.org"
 SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug selinux"
 
 RESTRICT="test"
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 9fb9d53215e7..090ebd1a1ea8 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,2 +1,3 @@
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
 DIST patch-4.13-rc1.patch 68530295 SHA256 4be8ec611672ee0907635b9b6fd83c7f35e122f1ad1bf78b7210a6c17ce9d1e0 SHA512 a781b939853ffaa31ad088cdfe788fd5e3be2e2a1243798fbf5f0a4fcdd81bd23a41c9aea3d399c585334043667c21e0becca9e5e657ec9a671ba8e52413344a WHIRLPOOL 7528166cc9f095ce10650c5df11cd185581be0aa7c6536f44346466352bfaa1ed3c93f50957b511cd0241f1bae67b6608615d092226ec483229fe1785b4349b8
+DIST patch-4.13-rc2.patch 69303063 SHA256 49f620f6e4525844e9ea8fcc2c87d8663a80ea4505f83dd71e51a5d37ca736c1 SHA512 35fa13157ab71f1ca67df204ea7811f1e26c364d4e32d5f184665979889b9435fcf5c4587d0f8ec6fa30e1b298a0712d64f0051e2414ac086a94a104b1d8d191 WHIRLPOOL a9127ee90c0bc18e47916938d8dbb5426c6af755e2075d74f26cf66bce1b2a5c0c819e2d1639a39ed1c66152f731f7076d0d2b96f8004b7f444611b910148909
diff --git a/sys-kernel/git-sources/git-sources-4.13_rc2.ebuild b/sys-kernel/git-sources/git-sources-4.13_rc2.ebuild
new file mode 100644
index 000000000000..125764c702a1
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.13_rc2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.12"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+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.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.9999.ebuild
new file mode 100644
index 000000000000..d6070ffebfca
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.9999.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils flag-o-matic git-r3 llvm python-any-r1 versionator
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
+	https://github.com/llvm-mirror/compiler-rt.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+# Note: this needs to be updated to match version of clang-9999
+SLOT="5.0.0"
+KEYWORDS=""
+IUSE="test"
+
+LLVM_SLOT=${SLOT%%.*}
+# llvm-4 needed for --cmakedir
+DEPEND="
+	>=sys-devel/llvm-4
+	test? (
+		app-portage/unsandbox
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
+		sys-libs/compiler-rt:${SLOT} )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm
+	fi
+	git-r3_checkout
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# built-ins installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=ON
+		-DCOMPILER_RT_BUILD_XRAY=ON
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	cmake-utils_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-all
+}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index 78ba67169d42..1f3e2089454c 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -18,7 +18,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
 
 LICENSE="|| ( UoI-NCSA MIT )"
 # Note: this needs to be updated to match version of clang-9999
-SLOT="5.0.0"
+SLOT="6.0.0"
 KEYWORDS=""
 IUSE="test"
 
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.9999.ebuild
new file mode 100644
index 000000000000..cb93d7d503e9
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic git-r3 llvm python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
+	https://github.com/llvm-mirror/compiler-rt.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+# Note: this needs to be updated to match version of clang-9999
+SLOT="5.0.0"
+KEYWORDS=""
+IUSE="+clang test"
+
+LLVM_SLOT=${SLOT%%.*}
+# llvm-4 needed for --cmakedir
+DEPEND="
+	>=sys-devel/llvm-4
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT} )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+		strip-unsupported-flags
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-builtins
+}
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
index 03c34d45531a..d9b46b7ebc1b 100644
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -18,7 +18,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
 
 LICENSE="|| ( UoI-NCSA MIT )"
 # Note: this needs to be updated to match version of clang-9999
-SLOT="5.0.0"
+SLOT="6.0.0"
 KEYWORDS=""
 IUSE="+clang test"
 
diff --git a/sys-libs/libcxx/libcxx-5.0.9999.ebuild b/sys-libs/libcxx/libcxx-5.0.9999.ebuild
new file mode 100644
index 000000000000..fde85c232023
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-5.0.9999.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Ninja provides better scalability and cleaner verbose output, and is used
+# throughout all LLVM projects.
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
+	https://github.com/llvm-mirror/libcxx.git"
+EGIT_BRANCH="release_50"
+PYTHON_COMPAT=( python2_7 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3" || SCM=""
+
+inherit ${SCM} cmake-multilib llvm python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+if [[ ${PV} != *9999 ]] ; then
+	SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz"
+	S="${WORKDIR}/${P}.src"
+else
+	SRC_URI=""
+fi
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
+	?? ( libcxxabi libcxxrt )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
+# LLVM 4 required for llvm-config --cmakedir
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
+	app-arch/xz-utils
+	>=sys-devel/llvm-4"
+
+DOCS=( CREDITS.TXT )
+
+PATCHES=(
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+)
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+	if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
+		eerror "${PN} needs to be built with gcc-4.7 or later (or other"
+		eerror "conformant compilers). Please use gcc-config to switch to"
+		eerror "gcc-4.7 or later version."
+		die
+	fi
+}
+
+multilib_src_configure() {
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	elif use libcxxrt; then
+		cxxabi=libcxxrt
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			# get the full library list out of 'pretend mode'
+			# and grep it for libclang_rt references
+			local args=( $($(tc-getCC) -### -x c - 2>&1 | tail -n 1) )
+			local i
+			for i in "${args[@]}"; do
+				if [[ ${i} == *libclang_rt* ]]; then
+					want_gcc_s=OFF
+					extra_libs+=( "${i}" )
+				fi
+			done
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			# this can be any directory, it just needs to exist...
+			# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
+			-DLLVM_MAIN_SRC_DIR="${T}"
+			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+
+	[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+	sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
+
+	cmake-utils_src_make check-libcxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild
new file mode 100644
index 000000000000..8a83444b8e8e
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib git-r3 llvm python-any-r1
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/libcxxabi.git
+	https://github.com/llvm-mirror/libcxxabi.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind +static-libs test"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# LLVM 4 required for llvm-config --cmakedir
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-4
+	test? ( >=sys-devel/clang-3.9.0
+		~sys-libs/libcxx-${PV}[libcxxabi(-)]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	# we need the headers
+	git-r3_fetch "https://git.llvm.org/git/libcxx.git
+		https://github.com/llvm-mirror/libcxx.git"
+	git-r3_fetch
+
+	git-r3_checkout https://llvm.org/git/libcxx.git \
+		"${WORKDIR}"/libcxx
+	git-r3_checkout
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		# this only needs to exist, it does not have to make sense
+		# FIXME: remove this once https://reviews.llvm.org/D25314 is merged
+		-DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+
+	[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+	sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
+
+	cmake-utils_src_make check-libcxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/libomp-5.0.9999.ebuild b/sys-libs/libomp/libomp-5.0.9999.ebuild
new file mode 100644
index 000000000000..086e4db0217d
--- /dev/null
+++ b/sys-libs/libomp/libomp-5.0.9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib git-r3 python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/openmp.git
+	https://github.com/llvm-mirror/openmp.git"
+EGIT_BRANCH="release_50"
+
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
+SLOT="0"
+KEYWORDS=""
+IUSE="hwloc ompt test"
+
+RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		sys-devel/llvm
+		>=sys-devel/clang-3.9.0
+	)"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLIBOMPTARGET_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+		-DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-5.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.9999.ebuild
new file mode 100644
index 000000000000..fc8c13fc44bf
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+inherit cmake-multilib git-r3 llvm
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/libunwind.git
+	https://github.com/llvm-mirror/libunwind.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +static-libs"
+
+RDEPEND="!sys-libs/libunwind"
+# LLVM 4 required for llvm-config --cmakedir
+DEPEND=">=sys-devel/llvm-4"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-power/bbswitch/bbswitch-0.8-r1.ebuild b/sys-power/bbswitch/bbswitch-0.8-r1.ebuild
new file mode 100644
index 000000000000..bb29cb2fd85b
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-0.8-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+	SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+
+SLOT="0"
+LICENSE="GPL-3+"
+IUSE=""
+
+DEPEND="
+	virtual/linux-sources
+	sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="bbswitch(acpi)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="default"
+	BUILD_PARAMS="KVERSION=${KV_FULL}"
+}
+
+src_prepare() {
+	# Fix build failure, bug #513542
+	sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile || die
+
+	default
+}
+
+src_install() {
+	einstalldocs
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+
+	linux-mod_src_install
+}
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
new file mode 100644
index 000000000000..bb29cb2fd85b
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+	SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+
+SLOT="0"
+LICENSE="GPL-3+"
+IUSE=""
+
+DEPEND="
+	virtual/linux-sources
+	sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="bbswitch(acpi)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="default"
+	BUILD_PARAMS="KVERSION=${KV_FULL}"
+}
+
+src_prepare() {
+	# Fix build failure, bug #513542
+	sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile || die
+
+	default
+}
+
+src_install() {
+	einstalldocs
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+
+	linux-mod_src_install
+}
diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
new file mode 100644
index 000000000000..1db623d583e9
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
@@ -0,0 +1,18 @@
+diff -uNr bbswitch-0.8/bbswitch.c bbswitch-0.8-new/bbswitch.c
+--- bbswitch-0.8/bbswitch.c	2013-12-04 18:22:06.000000000 -0500
++++ bbswitch-0.8-new/bbswitch.c	2017-07-08 01:11:54.588545766 -0400
+@@ -31,7 +31,14 @@
+ #include <linux/pci.h>
+ #include <linux/acpi.h>
+ #include <linux/module.h>
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
++#include <linux/uaccess.h>
++#else
+ #include <asm/uaccess.h>
++#endif
++
+ #include <linux/suspend.h>
+ #include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 8a332bf34a01..437e2daa175e 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -18,8 +18,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
-    Kernel module which automatically detects the required ACPI calls for two
-    kinds of Optimus laptops for safe disabling/enabling the discrete graphics card.
+	Kernel module which automatically detects the required ACPI calls for two
+	kinds of Optimus laptops for safe disabling/enabling the discrete graphics card.
 </longdescription>
 	<upstream>
 		<remote-id type="github">Bumblebee-Project/bbswitch</remote-id>
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/virtual/rust/metadata.xml b/virtual/rust/metadata.xml
new file mode 100644
index 000000000000..85cf4eb92057
--- /dev/null
+++ b/virtual/rust/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="project">
+    <email>rust@gentoo.org</email>
+    <name>Rust Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/virtual/rust/rust-1.15.1.ebuild b/virtual/rust/rust-1.15.1.ebuild
new file mode 100644
index 000000000000..4c56dd441f48
--- /dev/null
+++ b/virtual/rust/rust-1.15.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.16.0.ebuild b/virtual/rust/rust-1.16.0.ebuild
new file mode 100644
index 000000000000..4c56dd441f48
--- /dev/null
+++ b/virtual/rust/rust-1.16.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/virtual/rust/rust-1.19.0.ebuild b/virtual/rust/rust-1.19.0.ebuild
new file mode 100644
index 000000000000..4c56dd441f48
--- /dev/null
+++ b/virtual/rust/rust-1.19.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 2c1ecfc79296..7bc601daf0c3 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,2 +1,2 @@
-DIST opera-developer_48.0.2643.0_amd64.deb 50688714 SHA256 77a5bf0737c6128adf8d21b9a8bef58b70c7692cbc3345d1df88e260f1e084ac SHA512 3af2fc00cc9bc1e1c11765134a73018e0ce9f56b99ade1f77328ca41b624a2ac6bed43024564127c369522618797c4a198ac8d88391b2a71fbbc0d163b99b38c WHIRLPOOL cb5cce2d7498ec6706a0adfdaa3318e21bf1c28e93d9a720b9df724fb52ef8e0d327bf08f8d8785225d1ade34e71bd27586cdd21659eb6307354dc53448150be
 DIST opera-developer_48.0.2657.0_amd64.deb 50831978 SHA256 d3ec7488322e529e77d4090b3ad9e23f62ac4e3faa32bea4477ea9d5fd7c3959 SHA512 29222384fb20eda2791314dbe68aff76d3d4ca33291daeca0436920a70c749a39d7f01aa89064da338e37c0ca8a20223476c04a1bed5c0a8a23da3bfb63a3c1a WHIRLPOOL 3bfab75d4cf249007c08ea54bd6594b3005104e7c9a0cef4bc1aa414f7961ef28099e219b7b3588c919cf8a27113a8f76f2762feba90ea3b17444f8e4c165b5c
+DIST opera-developer_48.0.2664.0_amd64.deb 50521996 SHA256 f41f9fbfa69e36bcb78d5bff6f13fc4c4bbb38bf18fc73bade95d88f782fa2f7 SHA512 932e53e019f4588a8c4cac34c7c6dc0f4c692d2b206f6d5eae09eb3cedb8c0e9971d075d5096dc291fc616d3b4984eb8ff59da8e136ba7d8b2c13295931e662a WHIRLPOOL 39a95de2e31c32f4ee7f9f9cd4f10e10fa76605ae871428da0ae98c4e3b99117421900d4c21f18a0cd3cb6fdd0bf4b33b57ab19e565ae8ec2aabb95e23da5817
diff --git a/www-client/opera-developer/opera-developer-48.0.2643.0.ebuild b/www-client/opera-developer/opera-developer-48.0.2664.0.ebuild
similarity index 100%
rename from www-client/opera-developer/opera-developer-48.0.2643.0.ebuild
rename to www-client/opera-developer/opera-developer-48.0.2664.0.ebuild
diff --git a/www-client/seamonkey/files/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch b/www-client/seamonkey/files/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch
new file mode 100644
index 000000000000..fe3130e33692
--- /dev/null
+++ b/www-client/seamonkey/files/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch
@@ -0,0 +1,35 @@
+From 4604a80b052456f20187d89e5c3e115ef0bb7251 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Mon, 24 Jul 2017 06:10:11 -0500
+Subject: [PATCH] CFLAGS must contain -fPIC when checking the linker
+ https://bugs.gentoo.org/show_bug.cgi?id=607350
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ mozilla/build/autoconf/compiler-opts.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mozilla/build/autoconf/compiler-opts.m4 b/mozilla/build/autoconf/compiler-opts.m4
+index c12d400..639e99e 100644
+--- a/mozilla/build/autoconf/compiler-opts.m4
++++ b/mozilla/build/autoconf/compiler-opts.m4
+@@ -268,6 +268,8 @@ MOZ_ARG_ENABLE_BOOL(pie,
+ 
+ if test "$GNU_CC" -a -n "$MOZ_PIE"; then
+     AC_MSG_CHECKING([for PIE support])
++    _SAVE_CFLAGS=$CFLAGS
++    CFLAGS="$CFLAGS -fPIC"
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -pie"
+     AC_TRY_LINK(,,AC_MSG_RESULT([yes])
+@@ -275,6 +277,8 @@ if test "$GNU_CC" -a -n "$MOZ_PIE"; then
+                   AC_MSG_RESULT([no])
+                   AC_MSG_ERROR([--enable-pie requires PIE support from the linker.]))
+     LDFLAGS=$_SAVE_LDFLAGS
++    CFLAGS=$_SAVE_CFLAGS
++
+ fi
+ 
+ AC_SUBST(MOZ_PROGRAM_LDFLAGS)
+-- 
+2.13.3
diff --git a/www-client/seamonkey/seamonkey-2.48-r1.ebuild b/www-client/seamonkey/seamonkey-2.48-r1.ebuild
new file mode 100644
index 000000000000..01fae8065d91
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.48-r1.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_PV="${MOZ_PV/_p[0-9]}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+# the following are for upstream build candidates
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz"
+	S="${WORKDIR}/${MY_MOZ_P}"
+	# And the langpack stuff stays at eclass defaults
+# the following is for self-rolled releases
+	#MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles"
+	#MOZ_LANGPACK_PREFIX="${MY_MOZ_P}."
+	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	#SRC_URI="${SRC_URI}
+	#${MOZ_HTTP_URI}/${P}.source.tar.xz
+	#"
+elif [[ ${PV} == *_p[0-9] ]]; then
+	# gentoo-unofficial release using thunderbird distfiles to build seamonkey instead
+	TB_MAJOR=45
+	SMPV="${PV%.[0-9].*}"
+	MOZ_P="${PN}-${SMPV}"
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+	MOZ_GENERATE_LANGPACKS=1
+	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P/${MOZ_P}/thunderbird-${TB_MAJOR}}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/${PN}-2.42.3.0-l10n-sources.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/chatzilla-2.42.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/dom-inspector-2.0.16.tar.xz
+	"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	S="${WORKDIR}/${PN}-${MOZ_PV}"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	"
+fi
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.51 multilib pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
+
+PATCHFF="firefox-51.0-patches-06"
+PATCH="${PN}-2.46-patches-01"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
+
+SRC_URI+="
+	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=dev-libs/nss-3.28.1
+	>=dev-libs/nspr-4.13
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt5]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4* )
+		x11-plugins/enigmail
+	)
+	jack? ( virtual/jack )
+"
+
+DEPEND="
+	${RDEPEND}
+	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
+	crypt? ( dev-lang/perl )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )
+"
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/seamonkey
+	eapply "${FILESDIR}/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch" #625992
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
+	rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch
+	eapply "${WORKDIR}"/firefox
+	eapply "${FILESDIR}/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch"
+	popd &>/dev/null || die
+
+	# ugly hackaround for system-harfbuzz
+	if ! grep -Fq "harfbuzz/hb-glib.h" mozilla/config/system-headers ; then
+		sed '/MOZ_SYSTEM_HARFBUZZ/aharfbuzz/hb-glib.h' \
+			-i mozilla/config/system-headers || die
+	else
+		einfo "harfbuzz hackery no longer needed."
+	fi
+
+	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
+		sed '/^sdkdir/s@-devel@@' \
+			-i mozilla/config/baseconfig.mk || die
+	else
+		einfo "baseconfig.mk hackery no longer needed."
+	fi
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf old-configure.in
+	cd "${S}"/mozilla || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/js/src || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_use_enable calendar
+
+	mozlinguas_mozconfig
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| dir
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake DESTDIR="${D}" install
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	if use crypt ; then
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
+		if [[ -n ${emid} ]]; then
+			dosym "${EPREFIX%/}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		else
+			eerror "${EPREFIX%/}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "<EM:ID> tag for x11-plugins/enigmail could not be found!"
+		fi
+	fi
+
+	if use chatzilla ; then
+		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
+			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+
+	# Because PM's dont seem to properly merge a symlink replacing a directory
+	if use crypt ; then
+		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
+		local emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		if [[ -z ${emid} ]]; then
+			eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "Could not find enigmail on disk during pkg_preinst()"
+		fi
+		if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
+			if ! rm -R --interactive=never "${emidpath}" ; then
+				eerror "Could not remove enigmail directory from previous installation,"
+				eerror "You must remove this by hand and rename the symbolic link yourself:"
+				eerror
+				eerror "\t cd ${EPREFIX%/}${MOZILLA_FIVE_HOME}/extensions"
+				eerror "\t rm -Rf ${emid}"
+				eerror "\t mv ${emid}.backup* ${emid}"
+			fi
+		fi
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	#gnome2_icon_cache_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-servers/puma/puma-3.9.1.ebuild b/www-servers/puma/puma-3.9.1.ebuild
index 575676364d65..118aa44cbc3d 100644
--- a/www-servers/puma/puma-3.9.1.ebuild
+++ b/www-servers/puma/puma-3.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index ed3500ea05f6..1b58c638fc82 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -6,6 +6,7 @@ DIST NVIDIA-FreeBSD-x86-375.66.tar.gz 59154988 SHA256 b664c4796626213e7bee4cace7
 DIST NVIDIA-FreeBSD-x86-378.13.tar.gz 59610253 SHA256 aca461f050950f1a3a81137ec8adf2057deaa20ad166bdd4ce8f3e34616e7a98 SHA512 a0101201089df2bbf5bdc4ded2228dd989da6a47da31c3ec8d55916b1ff3457924555f82c7381934745fdc1b1f8f78e3fc10e5089279eb13423628dbfe560c6b WHIRLPOOL ac67d07d3ffb0959f685b7d59de152ba8fc97e11c30ed3f1a200511bcaf3de1cd1879147f37fde66a1c8d13dd327aac8a9ac78d42cc9656ef79e3180897aaef1
 DIST NVIDIA-FreeBSD-x86-381.22.tar.gz 60112159 SHA256 f309408941c7d393fe51b2356bd424791558b70f8f17f8856fbbefb1bcf74138 SHA512 ffe5882051fad081854e7b7fefe86a4da55b263b2ca217664991a7e0d84ff2f22d62a37c89afd578f3c99c12be897e5db7a3d1c71c747df655af8e220eb983fa WHIRLPOOL 42bd9205e28d067b1f7417607da21cd66411cefbd1cec74807bbdcee2255e758df2eb15f79a0c3fe1dde7d9f010cfcf648bb6a5890b4637ea7f799cc0810340d
 DIST NVIDIA-FreeBSD-x86-384.47.tar.gz 63215105 SHA256 c9841ec87c1c73c773ca174a7067786c3e4d45fd2a3d86da8ce3c84e9554830c SHA512 7dd0a596b6a4421cb7903facecf2453327aef4ce0a030fd3c37629e7a9b0e6f68ff10697fa5e2066055bddb5fc64b6c4a2a08cfcb7fdc0caa82be97de5b684f3 WHIRLPOOL 19a6d2c3f28b3dce2ba7c79a370c6d7529dc0f9cf1829d68771e9d5695f1a3d919ee292964c4476b97d10e52d4b3072c9e5eca77568926fa2d1066ab54cf83eb
+DIST NVIDIA-FreeBSD-x86-384.59.tar.gz 63257550 SHA256 0ae4aeb3beab6be586cd76f193d03ee7aa7397c66bfcdc84ab6629f808543bb0 SHA512 00598c3fe0d2361e0a8cf945fee19edb884c3bba059000d5103ea45c1f36a06238017752130ac7d8cdca0a7be87109dbb76b5cd318a5263495cbf0b91fc45fb9 WHIRLPOOL 12a9d4d5fbe5af9370e40ecea9fff7b9ffd868da988dd69bc9ad9b27529401a7f910f7013cb1a3765b5edd175c9c97eab0ecdce858c44adf5d8e6450ddcb38ee
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.135.tar.gz 36144428 SHA256 0e415045b96bb272150d35d72c4a17c3d8e7b593dc7ffc577f6f25cc04f9de95 SHA512 8939f0153e7dc98ed147c79a042731461f87582ef46c4762afadf6a5e1cd0ca32ca99415a3819f7e5abefb2df5c59731454e80873d3d622b73f27e75518c8793 WHIRLPOOL e8689e07f12e169f9abad243111bcddee7796826f0028d29bb5eb340649696a3688a74068f07f52d6764fba9924ddd1dba18e8ae442654fffa9b902ccbde2c7f
 DIST NVIDIA-FreeBSD-x86_64-340.102.tar.gz 60862932 SHA256 6d1108c2e8d1b25eb16cd8dc4eb221f2a20d2e4c39a515c0b5809fb407991f94 SHA512 fddef644937093550f9e5dfc25dc5cb81280785735c2d11f644b5eece8144b23bc88a353534ca95e925f54da9131ed5dd7460b72e554b6625df33e243476588f WHIRLPOOL 0b19ef96124768b8cafb0211a79f8ba6e3d04d9289d5194a59fdaa4eb15ab898c103346892007d9fd6eac75d6d503cd9724ab8f60bd7cf28fee2f9307b03d70b
@@ -14,11 +15,13 @@ DIST NVIDIA-FreeBSD-x86_64-375.66.tar.gz 58343065 SHA256 f6977d58d57818c27989d0c
 DIST NVIDIA-FreeBSD-x86_64-378.13.tar.gz 58779963 SHA256 451b9e4b2da86609c760a9a133efa8d37d844ad036299689f007c90463a7ca39 SHA512 34cfc383ba196ecec2cd27fc12bf30dd58f8782b73414e7b4c182e832ae0dce1f8c017afbb2101d7525d4e321f80cac49d3b578a8fc0cf88be9310f4deb77057 WHIRLPOOL 23929abd50467f267cf6b7d58a49fc6f667036b7e92363cc05b021790d0d5ebc61e181c3b2e7c32a6338328cfcc05311d74112b005d638c0295b2c6189dfa3b8
 DIST NVIDIA-FreeBSD-x86_64-381.22.tar.gz 59284579 SHA256 f63001f380055da84eec7aaeddc13442a004ca6979adbfec46d3efac4bad7116 SHA512 51c5a87fabe87ec7f2589ed97d97447b127ecb5fe501c60bc7c9fce74141c127f4f9bb820d2a9b34fb56db436476d0cb18a73845ab4e7ec2315d4975c8ce4e32 WHIRLPOOL 40e1c62b9c8b1d5b20eaa1737285e1ce01e912b013c1aae7c9167e6d240cce5a461fd955e5583065a206abf6d6b195c8916464ce1dd4a53bb5ee94de3679373e
 DIST NVIDIA-FreeBSD-x86_64-384.47.tar.gz 62415203 SHA256 c7d37b51c62b2a280b0ba19c5d9e8739a6823bf403012225d06743d4e53fa60d SHA512 7a23953f1d6a5538f1522d9a06f573ae9bfa395e47be22e8ea6c74bc58d5081e62e3c48c2058462af22180adf417796e8cec2cf94c4d65f3a4aca459f14cf481 WHIRLPOOL e1bdd9d6d31dd19c3a6b55b82102d4e3295ccec1fb2022d9062751509a2c8da7f6de0d92a9b11f696ab386a21e676617714d1648cfb22d615a4acc1d5751006a
+DIST NVIDIA-FreeBSD-x86_64-384.59.tar.gz 62465295 SHA256 325612d3fa039b34f6f6e817eccfa03ef0b45346acf14e5d6daf01a6d4f4241b SHA512 ac2dac82e24e192812dd2f0c3c33d5ae06e41ec8f8f23c26a4d617e92494cb5509c9499c934355823261daa1ab9e98f68b804efadff86e99cf7d093b8125875c WHIRLPOOL a4bf1c3980699ab355788063ba184ab142ba8f0efd2398c38f9e1def875558bb67fb8d92df761da56ff84464d5b38eef7962f36219b7c311ad05d9d3dbe56fe8
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.39.run 25350238 SHA256 52f512bbb3e2d5747df9b294667df9975564408c5ce4f3124aca7dba4355a3a9 SHA512 d888ab0c81c53138eec06e25be683798b5459a6862affa92429feb1e63fcd4cd7ac76bd78eff8c1bef245a25a6a7eb77994ad99c15ed65e8be1a64b3e4c45030 WHIRLPOOL 5714fdcd9e226a336e0abd46bd8a91eef486fc14de543a98d284b3ae3955e924dbde10a08144309b6c0b4e19fcb011bffb8c046a05cbe05f6123b22d270e2939
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.66.run 26668661 SHA256 eb9ac4a3e7dad9f1a149eb04a4d6668b73b75b0e12cca41f12ac52db3e39981b SHA512 fa60b385f7ae79de28e6cb452c249c26a6dbec72f0ab1f31fa89fbea937e5bb13303b32e275384d834b524e58d47fb18497e0920657307a89f9cebe8aef96909 WHIRLPOOL c34e92a43601240dca0dfd2d14f75ce828b12c2da80dbafaf67c6437ba54dc214ca69ce0d0f1a8bef883539ec8430761055b0cf60d9a4502544b39d98bae9648
 DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 SHA256 399abf527d84e4b4d01ea66e0de4a1f9b1b39871b180ef3bf99c4718ebe3db91 SHA512 253786a821df85fa926ae842114321b3c70502f887ea7c2b6790dfe3836039ee5d390e6722ca8785904ec6487e465916923d3042dc6191b3b4522c3161b80cb0 WHIRLPOOL 154b13ecb368716980ab779894942831c13e4b2d47c1d5765ab14590663b34be1571df7934e1277c9a29cdfe93e209a04e2a9fed2830c407a42547433fd9e721
 DIST NVIDIA-Linux-armv7l-gnueabihf-381.22.run 26815484 SHA256 246272d7da8f60564f4a0776fb3af82652add9e0ced8f856dc6530f97e97a748 SHA512 934cda37c7aed26243b5b661122e1c060de5b4df890aaf2295b6650dddea37cb4f0e3f0bebddb00b5d687b66ab5e028a203195c4d4ad3379593babda42febe77 WHIRLPOOL 33f5f0b0a9463419a2dcc6b2d6026607e28b13982fd0e26ffa797d9ba3ea6aab045b52523a653aea8378d31cd787628db1707c33df61c5d9b9943c07dde209aa
 DIST NVIDIA-Linux-armv7l-gnueabihf-384.47.run 28611505 SHA256 9e78263c3bd55fdf6de58c3e5f4b2ea3a29588587d3746251fc1dffd5f26f300 SHA512 a4d73bbcae086c1cb6e38be53d00940bff4abeb0a71c025c0aadaccab19dd30a674b7749fbf71a423797fdfa5d9a1c0a6f3e8a326e19f7e80a7b1b86f8f58cec WHIRLPOOL 00d2fdca01e0aa9f2d885e968bb6591fabd97c575c83a03d3cb1dd8e396b85631a45abf997001eae827b2a0b2253bcc2e6788365647b3115644fc78b78ebe76c
+DIST NVIDIA-Linux-armv7l-gnueabihf-384.59.run 28594162 SHA256 d77e90d34f1110208716c9cb1a208cc066ac5beb6055c5c9ffed538a534b34c2 SHA512 7ac7f42d5e203e22603682660e0e641f08aa9321ff7be0421d23a19af0b9d8d9efe53d4194ff65467fbb419910d64fe711d5b2a1583de987f3e73c1827bea2fe WHIRLPOOL b703954018f3139f2c92d72cc6f04a5a676fe7f75fb38c6b4782adb673f84f1df4ad73360a635df121ba9f7d0e364b79c018271909af286b5c7a042e2205749f
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.135.run 41202842 SHA256 5cb0a191ddca7b4c72b3c26cd57b7d719878ce628d24b5b026a0e5c8d3a00d93 SHA512 c2645cc9a6f23641d8b6da51e72e203980068c05e365fcc73b32322a6875ce95e81f4e0d893276e14e84e93464488539c16db6b3be04f5324cf7d7a12bb557f8 WHIRLPOOL 79d0d0badd36c94f3d48eef2c40184ee876bf78e153b18e73521fbe756cd78248da38405e7c08abbfa400ee8cd8150d81987bd7f45501937a77c39f7fc9a0ee6
 DIST NVIDIA-Linux-x86-340.102.run 38779756 SHA256 61b13d5dae0f6f5d788a4d8c4c98e8d971d19cb90b606058060d007946248828 SHA512 bea700c925a6044fcded40324bb389c5fa1aadc40831f685a76e7b0ded11161f492960950c201467e564d157dcbe0c330d13a2014f51d0073002c5a262a6f0ca WHIRLPOOL f7a3e3c5f8bb9eedf0a93104564d3d9c3eabc39a807c47e87f84373f89513afcafecb94e602b12fd24f872971f2d16a5f945326c670a6eebcd9ffcdcb70cb99e
@@ -27,6 +30,7 @@ DIST NVIDIA-Linux-x86-375.66.run 44495924 SHA256 29220e249a308f89c2a6fa48be6a000
 DIST NVIDIA-Linux-x86-378.13.run 44397547 SHA256 05e62a6098aac7373438ee381072253a861d56522f74948c2b714e20e69a46b1 SHA512 b96d2558a1003a3c66cade3a1e16abd34d855c0e27cdebacdc0495e0ba3cd5c68bb84cc5f81bff1b9ddce36ac52e0dc125c56d868b77d7c8e2f606d559b13b4a WHIRLPOOL e8231978664cec766813821c0f363ef437ba627debc2d2664164fe44c344c480c50799710dbeeee782fdacdb66b16317d69a9dec4f21d347dc40e471201b3ed1
 DIST NVIDIA-Linux-x86-381.22.run 42931990 SHA256 7b7dd6ee1c871dc5367fc207bba65077c3820a683decbfe6126fc70c0d1b9d08 SHA512 15723bfa25b0f39224ad5098c784a292abe4bf1daafaeb2f1df910bbab466e666b848b12e50b0bdd45f83e2d81957425a63501550b3dc5eb8fe3e576a8a10d22 WHIRLPOOL c01bec46411e3fc7f29cb38c6a16c8d50a3979cac1ce6a9e58feeb5878f6388f955cb95e0ecf71482c0fe9c1f57c989ecee6825bf921a0cf95c242f0a1ed3c23
 DIST NVIDIA-Linux-x86-384.47.run 46257041 SHA256 433917c5feca240abd936eecfbbd020b3773afead083802afee3b56d8a5bc256 SHA512 3e4e6e6f154d15e0569b156babcf4ae95d37f2a1080baa6f7c7afbe4581f1a2976a3adda721391159dfdb76c78f81757aadd55d172b5986ed167f8ae61eda60d WHIRLPOOL 45f23943a57119340a56068ef6371db7abf4a0eb1a4ad67760850882d52fef4e9f9b4e562e4fcb315ddeda8caff88b2ebf38766de7a9717221e2695ba6c7775e
+DIST NVIDIA-Linux-x86-384.59.run 47228533 SHA256 0c17658a4f874df43c02b521cd0a1357dfe2ea0b553be6b47ebae2e45323916c SHA512 09ceccb8c5bc136bb8ba75b8a15fc0cc08eb3680b6c5233b3dca4a1c55d14461d9adee2c686baff4173c8947c0bbc6dd52fcff5c1715a157015ecf4e802b214b WHIRLPOOL 72c05dfd9524a6551cf36fb2d1a8314414d756ee78735882aafee3c9f22ce906afacdcd0c38d781ff7056e330b14f71e5419fabdfa2811bd9cf7035e40ed0127
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.135.run 69766944 SHA256 706269a507995544a24d24b3386d8f7bddbad3ce52167fae0da9e00dad8ab588 SHA512 1b444eb4af219506c88fdc78746eca1afb8571017858cb387d8546f1950d6d82c1077c74e9bda9ccebb0e42bc5cb4d50d9b8c01989ae4cb52c3fc069304b7ab5 WHIRLPOOL 1fdb38f634ad8e41e37e1fb7d84ffb22566b4c5e182aa90f6a034db99c251864759909ad0b9db77ed08645c0da50362e40bc37574f526d58bb3eece7c37772a6
@@ -36,6 +40,7 @@ DIST NVIDIA-Linux-x86_64-375.66.run 75096990 SHA256 59e37f570ba5f3d7148028e96684
 DIST NVIDIA-Linux-x86_64-378.13.run 76239469 SHA256 3de379249ef25a8c10a24be2718bf1cb2e338da204e37874c4a0c66dbcdf42ee SHA512 2f6789aa0a400c035c0a074631dc5c26abb4f8a62efe928ca3a2865b89d29acfc09c27f23a664e438275e4bfd25c261745d4d495f9aca5f54ee6c53a389059d2 WHIRLPOOL 6e8dcc7be0981591f377babbd9e1430fddeac9a42291f36a95243d418882bc8b38a1e692e2fd62d4b785feca93165e54a64c015bd99193c699831465f512b180
 DIST NVIDIA-Linux-x86_64-381.22.run 76581130 SHA256 1a3ea8a19fbf650774e5ecd86caa5ef950971958226ed04020b0e6e29b4dd28d SHA512 669a3dd0896d68ba8eef4689b01971b92ec1c54e6cf2a9ff8d3f281ae9f2fe402f079e76109b65e698d76798bcc7a9bb43da9d128fec59ac1fafafd1c4a1e42c WHIRLPOOL 6e80c1fa813bf2930c3d47198e0e382c96ed5c5bc7ba9713e55e61e3fe2ab12c7b28526b4940b15b74e19169c1579151272bdc4033641158012c8f6a56736c3b
 DIST NVIDIA-Linux-x86_64-384.47.run 80461528 SHA256 4a79109c5d29e51f8733ee899cefacd30dc184a963712905eb7ccda4e5781566 SHA512 3dec8099408bd98ad7c327edadf4028cc24f6123250836d9883ba5fc333bc5b8a3083794c582e6115d91b57d22a43e7d700a501fd61e95753937702e9d3627f4 WHIRLPOOL 9509f87a354754cb6490bc0aa29d7eae75d8a882abf93c618ef41bce819b19aa56d4ec0b5b2287c96ce26da78f38185764a7504730393d98f5fbaf80a8bad2c9
+DIST NVIDIA-Linux-x86_64-384.59.run 81794848 SHA256 7b53bdee6e396cb271b57f77455fe5c561e655ca3fbba015dae0de3d6c11542b SHA512 e31c8e08b43131f6ed6c092a7e9086a1fc029ae06b3ec3cd059e939e890b177fc782414114dc432142354c96d1fddf43d90b20da03308fa7a96dc2830fade786 WHIRLPOOL 5816ccc8e6e7b1d0f7f3c8404e917fc5a6d6488e0a69a6b00e5b965926ba236dc770364528007e2af190d2a5f586d3a60328871e76291e4eee83a04bedda46f8
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 DIST nvidia-settings-304.135.tar.bz2 1480857 SHA256 f5431a6547d7727506b72616156c18f927a89c0702e7f939b5043fdb66e4faf8 SHA512 ce77819c223d02bc5330a57047b45cf9022159b0d03b3fb1572a64aebbcb5872312acef3f56e2574acc4c2c92eae9ac6e602327fd2658c47f2b97c69cf61ebfb WHIRLPOOL 5fc6c4ada22d8a1b0cade4049691c013a5dfa0a7777d7789f310d363c9c4ed5cb724acc153ec562fcc2266228325096e3f733e8f1517a74c047388a4361d25d8
 DIST nvidia-settings-340.102.tar.bz2 1550093 SHA256 2895d4e2597a6ea0c425d74c7a0808775065f5cf58397fbbe6e626b00c60a55a SHA512 1ab190d8bcba7cc39d47f38db2bee28fab48d48c9a6674c9ff29ea3f51103e13746ee1df2d30581bd8259fc1104fed90b36cba88907bb2f202c931d256eab66a WHIRLPOOL 58105b371bc7156c2749f4bf85377f06fca71eb0a933721d70987aa53bb6c94494de3be25363ccf326105ca475405dcd7c884ceb6158df352ac6cc70dcffbf7e
@@ -44,3 +49,4 @@ DIST nvidia-settings-375.66.tar.gz 2114252 SHA256 3a93d845be4a94f03e9768ee78d9f2
 DIST nvidia-settings-378.13.tar.gz 2112676 SHA256 a446ec3553f3fd16f60a0cf42cf9cf078cb3911595bb518649c489334422e85a SHA512 6f5fda9c54b067e21f2c869bcfb7c799c99f584d769020cb15e8764f59183e6a6469919ec48bce47be2144910d0004a9ca221df4a9e4fa9ab9f18710b36fa420 WHIRLPOOL 2eb475a8808bdc8380eb92c4189f2ca5aabc839d466efaaaeef6737aa8a75014e3252fd3d4a1344cede268c3bafa52ddb07057aa500ac6f626382e220326474b
 DIST nvidia-settings-381.22.tar.gz 2127491 SHA256 83cade551b43055bf93d7ca7e5911a4c61a9e7bea7d88b4c57aa885e82165e29 SHA512 79cd41b9c0e63b69574caddb62437132810ecb4cd07b90899976ae8535948f28d72021fc9a6969559909cf0f7a5d411b0202782970d64a82c636e7738c9d5681 WHIRLPOOL dfd0a4c568aa6ff1946fbe7c68f0c8cf8721c46bbe5dc82987ed900ca4b275781e7d1784e3094472ad9748c4008b5639791dcf51993b73aaeb03ce9a8e3a524c
 DIST nvidia-settings-384.47.tar.gz 2133544 SHA256 7af45ebcba94cd8e924d4b90e19043eeff9315550da3323f2b4baca1dbf52fa9 SHA512 249dfaf864dc5923a1f3249b750410f128bcf209050501cd75d0c35f615aea42920c88f0387bddf30d6cce34320888f177caf1cc91c5b5215b36c9b244ebf7e4 WHIRLPOOL 3d5580199e18c2dc33cbba7416f640b229bad2fde236c31aae72687ee70a4a433acfe7ffb0f5763bd4847513d9c8080bce0903465da35b1905da8da7ec551de1
+DIST nvidia-settings-384.59.tar.gz 2133723 SHA256 2ba5d254b2cbc35aca7862f6d7cbac8b6aabd9c082f7feaff7fba7b3a6a32caf SHA512 5556858f02f5d2b7a5b2fb6073902e98dc7d39267186cc47b810f07463e8507162bdffdf20f15e569766f05b411376a9002796979fc35a01b30aed821f0c3c47 WHIRLPOOL fcfd47ef9b5c3b9b40d62f3f7ec801d65c4efb99756dc727d5c050b1ae12a6fface409188b041c97b6e2d6daa3011d6e0b09cea6b1d7bee48907df38ce02101b
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-384.59.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-384.59.ebuild
new file mode 100644
index 000000000000..37aa92992a54
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-384.59.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://http.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	arm? ( ${NV_URI}Linux-32bit-ARM/${PV}/${ARM_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+	tools? (
+		https://github.com/NVIDIA/nvidia-settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
+	)
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.19.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+nvidia_drivers_versions_check() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 13; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.13"
+		ewarn "<sys-kernel/vanilla-sources-4.13"
+		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 "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+	nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+	nvidia_drivers_versions_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
+	fi
+
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	# Allow user patches so they can support RC kernels and whatever else
+	eapply_user
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die 
+		sed -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			DO_STRIP= \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			DO_STRIP=
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		doins "${FILESDIR}"/nvidia-rmmod.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.0.1"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 182bd8b49371..032e543e391e 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1 +1,2 @@
 DIST dunst-1.1.0.tar.bz2 79032 SHA256 c72bf167eaab4e44a98ec87101b023efee0aa8916df56630b99a5bc53f8d7070 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b WHIRLPOOL 6985c17549de4c7f6e2ba17ae1117db21693f4ed05df65e6238cfe6001aeb9c7a98834f3e794a0c80dbe913099082624256708c29ffa02cf35b0ab0032e94926
+DIST dunst-1.2.0.tar.gz 110628 SHA256 a3c05b5ef87e88704a6207236e42773dfbcf50cb23c7cf51e494a7236b75c5ad SHA512 223c8aae61574770a76bff84723643a3c03d3d9a8f4094bc4e92e16826703e7c0a7c3327945db8469b8dcc48fe5cfaba51e6724149e6571a7ffc1716656e30f3 WHIRLPOOL 1c9cac734d8d5378a7fe77381847a94db692b59d26bbaa6e06d9a65d168c371a2fd2ce4a649b9ded130c4228940bfe01004c38eb20889e8794e25a83e7ba46df
diff --git a/x11-misc/dunst/dunst-1.2.0.ebuild b/x11-misc/dunst/dunst-1.2.0.ebuild
new file mode 100644
index 000000000000..3fe1d29fc90a
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dunstify"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxdg-basedir
+	sys-apps/dbus
+	x11-libs/cairo[X,glib]
+	x11-libs/libXScrnSaver
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/pango[X]
+	dunstify? ( x11-libs/libnotify )
+"
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	default
+
+	# Remove nasty CFLAGS which override user choice
+	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
+
+	if use dunstify; then
+		# add dunstify to the all target
+		sed -i -e "/^all:/ s:$: dunstify:" Makefile || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	if use dunstify; then
+		dobin dunstify
+	fi
+
+	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
+}
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index de0f8c42aed8..b18a6c60aa52 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -1,3 +1,3 @@
-DIST wmbutton-0.6.1.tar.gz 48404 SHA256 423c99bff4657b968cd14913097e8ac821a6b238b150fb4eacb36d661739a09f SHA512 b9e0721f042f1cd526c2ab41f7f4bf8e815ca2e7cd203ce8e6cf137dc5dfce3f06cddf42b729d3aaed0fbe0bfa0ca1bda8a2d51cb99702534de681f9bc5ac745 WHIRLPOOL 48fe231bbbcef0342ee4d91755cf12b209e701740560a1c283cbcced3a294b8fe29b8011431e9c39b70cdd31679960eb24ef4f4a2aed2c9734fd4c9a55ff132a
 DIST wmbutton-0.7.0.tar.gz 48381 SHA256 dd6d7a4188b9acd22538d04de2ce0a5e3822e91488a1521df4ff9d09a922f950 SHA512 dc631caca0b1ed6daf8781a0893464b91d788b3d0f81dc22a33d13715cda7becbb145d2d3d34ab93a9a343ed178171c376f81e2eb25e9436d1da8ee2d6455ce2 WHIRLPOOL 0b16fab3064ce98d1c6fda5e4856ec9b3b63b7733bc39ee4ab2a96faa7829e77f5e2a45b60124e4f1c91bfa1004c2b6cf3a8e38d8142daff11e34013a2576570
+DIST wmbutton-0.7.1.tar.gz 140293 SHA256 9a80da3308a36993a48d5e25da800e8a6e5287bf4ae2ad6fc59b03dc2c5db519 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068 WHIRLPOOL cea857d5085939e2df4d1b70ca02d4173e917976f69ff4e6dfafe60dd69e9d71b522dd48738bf576485d593635e73b31596f63059bee013eaf543a66d4c39d9c
 DIST wmbutton-buttons.xpm 25003 SHA256 357de6947c75339ed8156bd09287f82ef46dad22d16b1c82f7bbce12fd287318 SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c WHIRLPOOL ddc743a8d689ae46a44515e39531acc63a39534cbbf96184e6fa7e243dd1cee253ca10da65aec03391e6b6a92ddad72826bb1be56c6a301a786e90beddc4ba5f
diff --git a/x11-plugins/wmbutton/files/wmbutton-0.6.1-Makefile.patch b/x11-plugins/wmbutton/files/wmbutton-0.6.1-Makefile.patch
deleted file mode 100644
index 7654c8cd40e7..000000000000
--- a/x11-plugins/wmbutton/files/wmbutton-0.6.1-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur wmbutton-0.6.1.orig/Makefile wmbutton-0.6.1/Makefile
---- wmbutton-0.6.1.orig/Makefile	2005-01-16 17:12:54.000000000 +0200
-+++ wmbutton-0.6.1/Makefile	2008-01-13 08:15:02.000000000 +0200
-@@ -1,19 +1,17 @@
--INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
--LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
-+INCLUDES =-I/usr/include/X11
- LIBS = -lX11 -lXpm -lXext
-+CC = gcc
- 
- TARGET = wmbutton
- OBJECTS = wmbutton.o wmb_libs.o
- 
--CFLAGS += -c -Wall -O2
--
- all: ${TARGET} tags
- 
- .c.o:
--	gcc ${CFLAGS} ${INCLUDES} $< -o $*.o
-+	${CC} -c ${CFLAGS} ${INCLUDES} $< -o $*.o
- 
- ${TARGET}: ${OBJECTS}
--	gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-+	${CC} ${LDFLAGS} ${OBJECTS} ${LIBS} -o ${TARGET}
- 
- clean::
- 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff --git a/x11-plugins/wmbutton/wmbutton-0.6.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.6.1.ebuild
deleted file mode 100644
index 59781a99acff..000000000000
--- a/x11-plugins/wmbutton/wmbutton-0.6.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a dockapp application that displays nine configurable buttons"
-HOMEPAGE="http://www.freshports.org/x11/wmbutton"
-SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${P}.tar.gz
-	branding? ( mirror://gentoo/${PN}-buttons.xpm )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="branding"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	dev-util/ctags"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	use branding && cp "${DISTDIR}"/${PN}-buttons.xpm buttons.xpm
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-	use branding && dodoc "${FILESDIR}"/sample.wmbutton
-	use branding || newdoc .wmbutton sample.wmbutton
-}
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
new file mode 100644
index 000000000000..081ca01c1b1b
--- /dev/null
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="a dockapp application that displays nine configurable buttons"
+HOMEPAGE="http://www.dockapps.net/wmbutton"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="branding"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 8afd9d1823c7..4abb2153699e 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,3 +1,3 @@
 DIST xfconf-4.12.0.tar.bz2 542544 SHA256 9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156 SHA512 60cc37a7207b0486f7f2de665870facf8e339241df344d7540082f3db447b3ac88bddd306d6a09a3868878cb477d1696491c71470052ef56cb649d773bd55b56 WHIRLPOOL 73241764a03c865c3bcda97a481e4ed9c6bfd8a3fdfd1a614291abad32f11157ba50a14d0ef918ad3c397fdd015d3dcf0cd07e24e43fbdd5125d5c273d536c16
 DIST xfconf-4.12.1.tar.bz2 564131 SHA256 35f48564e5694faa54fdc180cd3268e16fc2352946a89a3c2fc12cbe400ada36 SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f WHIRLPOOL 17ccadbf9759cf2c84f09f58f0f3c65a49a4dab3965a1deb7a42d5635075b4d60dc96556d0cc80d8b8df8c91bae51d9e3864409020b32058694d15f340d3f9c1
-DIST xfconf-4.13.2.tar.bz2 591620 SHA256 52d700908365d7c1a15d4fdb9d09b6502c4819ffb034536722cce1e15e1818da SHA512 a30f70a6442a51f6ae305cebb4863db833c752c93ba4091ec8a5fd3f66f4eead2bc460df4c6c5275f3d1610f80fd1f6b57c33e0ac59adc94d21096fd83b82c4a WHIRLPOOL b2f62847373c4c16fec578214d1b60151413e3c30cb6a8c2c956e89d0608520db7e54da05c4593eca1041ba13b0717aa5c80c70c5f6d665e343e2183e8b8bb54
+DIST xfconf-4.13.3.tar.bz2 597311 SHA256 842416258d87f24b8e2b72ddf3cb1385d0c73c982e66b18d2b2e7cb8123f98c8 SHA512 d8b53f1785947c4c47de65fe7e43062a771b6a256e598eb09fee4be975c6ccf70446d922e2d50b52c68747603012b41ef69428f286ae8d2c0768f9e6ff8aee55 WHIRLPOOL 199af60c94a44b8350f922b2fb5e3325cf718d09ad80cd882e13b6879c673876a2b3b7d2ca860f28a8007255f042b4bb6a7d4559ea6df98e7b0e1fc348bdbf43
diff --git a/xfce-base/xfconf/xfconf-4.13.2.ebuild b/xfce-base/xfconf/xfconf-4.13.3.ebuild
similarity index 100%
rename from xfce-base/xfconf/xfconf-4.13.2.ebuild
rename to xfce-base/xfconf/xfconf-4.13.3.ebuild