diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 772bc1b76a6d..5fd2b8f577ff 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,2 +1 @@
-DIST entr-3.3.tar.gz 22159 SHA256 701cb7b0a72b6c9ba794ad7cc15b6ebcc2e0c978bb6906c8ae407567a044461f SHA512 aa45bef57fb12d5ddaaebd8de03df33b69a833e4b729ad9fb0844af1c8b7031fc37ca1c81170b20967aa7dbf8854849a7b1f46da6d1d13a49d4d33502269bbca WHIRLPOOL 97f256bb37f0e517365ef7f3353d08b7c702a8182051c985c13efee3613d43eeda9da8a2911407a733c5f51e66e0fd5204a07b13f11c49ab7449ddb7d69b4334
-DIST entr-3.4.tar.gz 22443 SHA256 ce7d000fd6f2b711df905e9a6d8a2a0f50026ebaf34afeb9132d52617b6e010a SHA512 c765b50fa131a3d89ef99856ece5a223a43f6bd8fb3df37b51ae1b27e9f22b05a7ca4dcce1752a255a2dd4634d8fb55fc499bb837c5005dc3bf095b7910d47d0 WHIRLPOOL 0617b5a39d735ddbc3fae9802b741874d78b50f84749ea775cfa11c673e6651bdf6eeb5cb0e4ab6e9c145408c3bb24800591d16335aa4022dcc8c07445d73536
+DIST entr-3.5.tar.gz 22222 SHA256 e3e455346bcaf1e9099547eb050fbf667a96610b34304e5513f90265a5976416 SHA512 dea5a201dd945fb25daf80030f8fae424dce2f51e6ce294bd1e609ff152547ea4bf4a555ad1b15f3b4fbca2e17ff34b2276b226790834f14a6f567bfb0cb4508 WHIRLPOOL a6cbad72202cb09df1a74ce7315fc3c2a7633b65c03a0c0f05a700c9ecf5a4b3df870a2d546583add4366224a585880cf2a35a61e5feba23d0cf3946f1412f5f
diff --git a/app-admin/entr/entr-3.4.ebuild b/app-admin/entr/entr-3.4.ebuild
deleted file mode 100644
index 6cafdf9259ba..000000000000
--- a/app-admin/entr/entr-3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org/"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mv eradman-* "${P}"
-}
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/app-admin/entr/entr-3.3.ebuild b/app-admin/entr/entr-3.5.ebuild
similarity index 87%
rename from app-admin/entr/entr-3.3.ebuild
rename to app-admin/entr/entr-3.5.ebuild
index 6cafdf9259ba..2c54d67ce69d 100644
--- a/app-admin/entr/entr-3.3.ebuild
+++ b/app-admin/entr/entr-3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Run arbitrary commands when files change"
 HOMEPAGE="http://entrproject.org/"
@@ -15,7 +15,7 @@ IUSE="test"
 
 src_unpack() {
 	unpack "${P}.tar.gz"
-	mv eradman-* "${P}"
+	mv eradman-* "${P}" || die
 }
 
 src_configure() {
diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
index db6a08ad01e3..f71e7172b1da 100644
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/metadata.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-  CD command line recording, ripping and copying tool.  Especially ISOs- and
-  bin/cue-files are handled very well.
-  </longdescription>
-  <use>
-    <flag name="gcdmaster">Enable building of gcdmaster application</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">cdrdao</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>brendan@horan.hk</email>
+		<name>Brendan Horan</name>
+		<description>Proxy maintainer - make assignee on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+	CD command line recording, ripping and copying tool.	Especially ISOs- and
+	bin/cue-files are handled very well.
+	</longdescription>
+	<use>
+		<flag name="gcdmaster">Enable building of gcdmaster application</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">cdrdao</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-shells/bash-completion/bash-completion-2.3-r1.ebuild b/app-shells/bash-completion/bash-completion-2.3-r2.ebuild
similarity index 95%
rename from app-shells/bash-completion/bash-completion-2.3-r1.ebuild
rename to app-shells/bash-completion/bash-completion-2.3-r2.ebuild
index 9242caf39263..9a1aecbb7e2c 100644
--- a/app-shells/bash-completion/bash-completion-2.3-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.3-r2.ebuild
@@ -37,15 +37,18 @@ STRIP_COMPLETIONS=(
 
 	# Now-dead symlinks to deprecated completions
 	hd ncal
+
+	# Installed by sys-apps/util-linux-2.28
+	mount umount mount.linux umount.linux
+
+	# Dumb symlink to mplayer, removed upstream in git
+	mpv
 )
 
 src_prepare() {
 	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
 	# Bug 543100
 	eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch"
-	# backport from
-	# https://github.com/scop/bash-completion/commit/0382773bbfc21dc1fb5467c1c0426ea3c984b6ec
-	eapply "${FILESDIR}/${P}-remove-mpv-symlink.patch"
 	eapply_user
 }
 
diff --git a/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch b/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch
deleted file mode 100644
index 62cddf789ad5..000000000000
--- a/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/completions/Makefile.in b/completions/Makefile.in
-index 940e873..f9aaaa7 100644
---- a/completions/Makefile.in
-+++ b/completions/Makefile.in
-@@ -1237,7 +1237,7 @@ symlinks: $(targetdir) $(DATA)
- 		rm -f $(targetdir)/$$file && \
- 			$(LN_S) mcrypt $(targetdir)/$$file ; \
- 	done
--	for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
-+	for file in mplayer2 mencoder gmplayer kplayer ; do \
- 		rm -f $(targetdir)/$$file && \
- 			$(LN_S) mplayer $(targetdir)/$$file ; \
- 	done
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index d0c4cfade516..6263ba925465 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1 +1,2 @@
 DIST tidy-html5-5.1.9.zip 1077163 SHA256 1c414aea63e168c5d28ec8aad047d68e12d07f67b891f4450252d0cb68154fab SHA512 a5f18d43333f5acb6a4290bd9960fbccb1fa07b180ac3e02ee0a1ec890fd3ebef6f0f2811df05f9808220945d9810f94059f328c2d0d6827543c6697d73e0dc5 WHIRLPOOL 8b10a34ce247077c9f7450b41fbbd0135f0a88214445adddbbf70bdb296d541b75188d491961e3f9fde465c80b1e09d060160e5c0609c9ba923548ad2981aa04
+DIST tidy-html5-5.2.0.zip 578494 SHA256 7f6ef14e41a0e9611fcb95e4926287e0d4a46c53335ae7e3aa4fc11ae69d32e2 SHA512 0559bbe24711606b391057b3dbf2692b54e548294f68b310be306b5be80c9265ba7c4aa8da2b13ba0c89dae1dd6d233aebebdba761e25193439a0c0d713e59d8 WHIRLPOOL 7040ad176d2a96936cf250afc16f8376c9febd80ef98976bca318407299e52896c34a23964654efb1d69a2bf49438f6402d4af9d140ce45f6fe7d27bda010dce
diff --git a/app-text/tidy-html5/tidy-html5-5.2.0.ebuild b/app-text/tidy-html5/tidy-html5-5.2.0.ebuild
new file mode 100644
index 000000000000..6220f310982c
--- /dev/null
+++ b/app-text/tidy-html5/tidy-html5-5.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
+HOMEPAGE="http://www.html-tidy.org/"
+SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-text/htmltidy"
+
+S="${WORKDIR}/${P}"
+
+DOCS=( README/{CODESTYLE,README,CONTRIBUTING,LICENSE,VERSION}.md )
+HTML_DOCS=( README/README.html )
+
+BUILD_DIR="${S}/build/cmake"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_BUILD_TYPE=Release
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd build/cmake || die
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-java/icedtea-bin/files/no-sunec.patch b/dev-java/icedtea-bin/files/no-sunec.patch
new file mode 100644
index 000000000000..c1d64bd215d4
--- /dev/null
+++ b/dev-java/icedtea-bin/files/no-sunec.patch
@@ -0,0 +1,27 @@
+--- jre/lib/security/java.security	2016-04-12 22:35:18.390181858 +0100
++++ jre/lib/security/java.security	2016-04-12 22:37:10.000000000 +0100
+@@ -67,17 +67,16 @@
+ #
+ security.provider.1=sun.security.provider.Sun
+ security.provider.2=sun.security.rsa.SunRsaSign
+-security.provider.3=sun.security.ec.SunEC
+-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
+-security.provider.5=com.sun.crypto.provider.SunJCE
+-security.provider.6=sun.security.jgss.SunProvider
+-security.provider.7=com.sun.security.sasl.Provider
+-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+-security.provider.9=sun.security.smartcardio.SunPCSC
++security.provider.3=com.sun.net.ssl.internal.ssl.Provider
++security.provider.4=com.sun.crypto.provider.SunJCE
++security.provider.5=sun.security.jgss.SunProvider
++security.provider.6=com.sun.security.sasl.Provider
++security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
++security.provider.8=sun.security.smartcardio.SunPCSC
+ # the NSS security provider was not enabled for this build; it can be enabled
+ # if NSS (libnss3) is available on the machine. The nss.cfg file may need
+ # editing to reflect the location of the NSS installation.
+-#security.provider.10=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
++#security.provider.9=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/nss.cfg
+ 
+ #
+ # Sun Provider SecureRandom seed source.
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
similarity index 91%
rename from dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild
rename to dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
index 7e102c67b0f3..f812c1e103ae 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.0.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit java-vm-2 multilib prefix toolchain-funcs
+inherit eutils java-vm-2 multilib toolchain-funcs
 
 dist="https://dev.gentoo.org/~chewi/distfiles"
 TARBALL_VERSION="${PV}"
@@ -90,12 +90,8 @@ src_prepare() {
 		   {,jre/}bin/policytool bin/appletviewer || die
 	fi
 
-	if [[ -n "${EPREFIX}" ]]; then
-		# The binaries are built on a non-prefixed system so the
-		# fontconfig needs to have prefixes inserted.
-		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-		eprefixify jre/lib/fontconfig.Gentoo.properties
-	fi
+	# Disable EC for now, bug #579676.
+	epatch "${FILESDIR}/no-sunec.patch"
 }
 
 src_install() {
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS.patch b/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS.patch
deleted file mode 100644
index dcc8c7ce52b3..000000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# add missing LDFLAGS to build system.
-# the configure script still fails to add LDFLAGS when linking
-# the libtecla shared object but since it calls ld directory 
-# LDFLAGS can't be used straight out of the box.
-
-diff -Naur libtecla/Makefile.rules libtecla.new/Makefile.rules
---- libtecla/Makefile.rules	2002-12-04 01:26:56.000000000 -0500
-+++ libtecla.new/Makefile.rules	2008-10-07 06:16:22.000000000 -0400
-@@ -66,7 +66,7 @@
-  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
- enhance$(SUFFIX): $(OBJDIR)/enhance.o
--	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
-+	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
-  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
- #-----------------------------------------------------------------------
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build.patch b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build.patch
deleted file mode 100644
index 846b038f713e..000000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.rules
-+++ Makefile.rules
-@@ -53,19 +53,19 @@
- 
- demos: $(DEMO_PROGS)
- 
--demo$(SUFFIX): $(OBJDIR)/demo.o
-+demo$(SUFFIX): $(OBJDIR)/demo.o libtecla$(SUFFIX)$(SHARED_EXT)
- 	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
-  $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
--demo2$(SUFFIX): $(OBJDIR)/demo2.o
-+demo2$(SUFFIX): $(OBJDIR)/demo2.o libtecla$(SUFFIX)$(SHARED_EXT)
- 	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
-  $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
--demo3$(SUFFIX): $(OBJDIR)/demo3.o
-+demo3$(SUFFIX): $(OBJDIR)/demo3.o libtecla$(SUFFIX)$(SHARED_EXT)
- 	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
-  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
--enhance$(SUFFIX): $(OBJDIR)/enhance.o
-+enhance$(SUFFIX): $(OBJDIR)/enhance.o libtecla$(SUFFIX)$(SHARED_EXT)
- 	LD_RUN_PATH="$(LIBDIR)" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
-  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
diff --git a/dev-perl/PAR/Manifest b/dev-perl/PAR/Manifest
index 87a2658dba2b..48bca4a1ed4c 100644
--- a/dev-perl/PAR/Manifest
+++ b/dev-perl/PAR/Manifest
@@ -1,3 +1,2 @@
-DIST PAR-1.005.tar.gz 88293 SHA256 c5e2aeb0380c132de251c3f4eb2fad3953967b94b2869f800956aaceab5c484f SHA512 875dd2da927082f865fe3097c68be064ade37e702e1eec44c948e20ec54029dc27be71662d3209c8eee135d2708bab19647ee0d00c1a24fa7e448224f38726b2 WHIRLPOOL 3fbb2e6ca11cc780753c6fcd0d67ac063ff19d08969db0627f3c69ce44bd2e41a1d1b33579e0285e446499c90ca2cf06d89e785e4d3b2c57576b3d0f50de6824
 DIST PAR-1.007.tar.gz 89784 SHA256 92ddc469fc6fc5477087ddb03ef04673f10efbd7eed84db8db452f8c5bd08661 SHA512 8d5aa4b3425ce12f64116c5409227afdf975545654d5f87c854d78d2c9f850795dde8cea9fe7caec98c527dd1004eeb7bda0aaeb5ebba71bd94d9d6c449cdff2 WHIRLPOOL 98769afcfb3d572346b56db863b9ba9db8b8f2a3a797a4017266715e0adef9ad93145421e8155eab9ac6db77078c8dd6f665024f6cd67aee92c4f622fa740c70
 DIST PAR-1.010.tar.gz 75412 SHA256 78af355e757a55bfec0db4a02d62c402c5c56b31e8d317f70a31fc963b2e7e51 SHA512 57e2c39927402c353ee356ae9b91b4233614afa9dca61c3c2effbe2db8b6c653949cc424b637d12dc89668ddf7f49a38d2e6610521410e613e061c0f980b304d WHIRLPOOL 09f71c55d28a559182f8e1ffecc64a8cc7d9b1dd90eb7a5a72a6c8ac5280691268751113c9f6639f069286326813820d26ea4738c471b80d8a1d3d74c1dde252
diff --git a/dev-perl/PAR/PAR-1.5.0-r1.ebuild b/dev-perl/PAR/PAR-1.5.0-r1.ebuild
deleted file mode 100644
index 3195945801ea..000000000000
--- a/dev-perl/PAR/PAR-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RSCHUPP
-MODULE_VERSION=1.005
-inherit perl-module
-
-DESCRIPTION="Perl Archive Toolkit"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-solaris"
-IUSE=""
-
-DEPEND="virtual/perl-AutoLoader
-	>=virtual/perl-IO-Compress-1.30
-	>=dev-perl/Archive-Zip-1.00
-	>=dev-perl/PAR-Dist-0.32"
-RDEPEND="${DEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Parallel-ForkManager/Manifest b/dev-perl/Parallel-ForkManager/Manifest
index fa7964d3bb0a..e1c3e4cc9a35 100644
--- a/dev-perl/Parallel-ForkManager/Manifest
+++ b/dev-perl/Parallel-ForkManager/Manifest
@@ -1,2 +1,3 @@
 DIST Parallel-ForkManager-1.02.tar.gz 13270 SHA256 fb005d9a25b9bab86244673deaeefc18e83c590dd2b9b74ef53d21134c981534 SHA512 a5efaf348939019494dc5c7bb56c817ffab09782907de80f0258ef75a4639e56919bb35608321a17aa9322c838def4eb789f2e4dc56ad44825a4b2997b798ed7 WHIRLPOOL 800bb5bd36d078c30fe594405011bfe10fb528c3f87dd15a87b82df1f9b76c31f2f5d58ed6d934a6fe1fbaa90595c44756704ed1b655de622ecbe420fcf9ba23
 DIST Parallel-ForkManager-1.17.tar.gz 23121 SHA256 a929002658b9b4944a4511e24ee6cda05d24c2a3ba54a5ce13e0b3fdf74bf0aa SHA512 2897cc737bc35ab88bd60fea1cd371a499ea32fdcc33095601ecf8930725dd6350041172dd138e4ee4a529641aacb6fa51ae34f7ac9f1359f910713f3afa0f2c WHIRLPOOL 1bdaabbf593fcccb86b89046f9b35fa5b11406fe7c0637fbf7329cf5cd9f89e9ad427a1d8cf44033c0345279c7f299828e7476f6b06fa92c5a640eacb6bb37a8
+DIST Parallel-ForkManager-1.18.tar.gz 23400 SHA256 a26d7b80468faaf07d64626c656d24ea029768dc49b9eaf15f624df2379915b0 SHA512 1d9f959f0caee374273c6eacd0791d758f899aa4a2fd5040232df82c170ba57de396608ce7f464412f00260ca14fb6e9302c6f4eab48419c6b445e86ae43366c WHIRLPOOL 0f048b0b4eec7bd5acc86ce7b34861debe9dafd4e9645e7b5e50d74d79c35bef410bee78c95b53df7bba7687a50e46870aa22dce2e559b865bb341e55b5df097
diff --git a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.180.0.ebuild b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.180.0.ebuild
new file mode 100644
index 000000000000..bef4e00bb321
--- /dev/null
+++ b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.180.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=YANICK
+DIST_VERSION=1.18
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="A simple parallel processing fork manager"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="test minimal"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	virtual/perl-Storable
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.940.0
+		dev-perl/Test-Warn
+	)
+"
diff --git a/dev-perl/Parallel-Prefork/Manifest b/dev-perl/Parallel-Prefork/Manifest
index 08522fcdecf9..97a7cca53eb2 100644
--- a/dev-perl/Parallel-Prefork/Manifest
+++ b/dev-perl/Parallel-Prefork/Manifest
@@ -1,2 +1 @@
-DIST Parallel-Prefork-0.14.tar.gz 25224 SHA256 68b70d0de6c2625e862402cc39288043f175816ede03d887a52f28500008ca0e SHA512 18a9155775779d85956492f252f87e543590e4b4403f40fd4da86f041784b344683d88db49137cdad1e5d22c6f1017453bab7c0e1fb38731933194a32015547a WHIRLPOOL 31e8da47668ba5d60c2b1acd63ee4fecfba2329735c4e76ee07b4921a647b8b7feec7aed683dcaeae94e640d2dd9d07503fc3fbe77c8bbaee39ba28af18ce0a8
 DIST Parallel-Prefork-0.18.tar.gz 28226 SHA256 f1c1f48f1ae147a58bc88f9cb2f570d6bb15ea4c0d589abd4c3084ddc961596e SHA512 9d2dc977d98c3ba263a0d8e189877b59661bfa9fdf97ed5e685271b4b1661522e8288ae8392bd9eeeafb21b37191e55a2bac35cce49d2d5d68e6c3e2d3353c6f WHIRLPOOL de02a41bbc495b82f8e8d153149855fd0d8f7800431b7e0f190789a5ecc8b4f014eaff39ff0a3cb44ee8699bd65692e1fc16a76a2d4d2dd5df0ab01dac940fa1
diff --git a/dev-perl/Parallel-Prefork/Parallel-Prefork-0.140.0-r1.ebuild b/dev-perl/Parallel-Prefork/Parallel-Prefork-0.140.0-r1.ebuild
deleted file mode 100644
index 8dfe99227b04..000000000000
--- a/dev-perl/Parallel-Prefork/Parallel-Prefork-0.140.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=KAZUHO
-MODULE_VERSION=0.14
-inherit perl-module
-
-DESCRIPTION="A simple prefork server framework"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Proc-Wait3-0.30.0
-	dev-perl/List-MoreUtils
-	>=dev-perl/Class-Accessor-Lite-0.40.0
-	dev-perl/Scope-Guard
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-	test? (
-		dev-perl/Test-Requires
-		dev-perl/Test-SharedFork
-	)
-"
-
-SRC_TEST=do
diff --git a/dev-python/dulwich/dulwich-0.12.0.ebuild b/dev-python/dulwich/dulwich-0.12.0-r1.ebuild
similarity index 85%
rename from dev-python/dulwich/dulwich-0.12.0.ebuild
rename to dev-python/dulwich/dulwich-0.12.0-r1.ebuild
index 77b59d28f652..9cbd12a7fa71 100644
--- a/dev-python/dulwich/dulwich-0.12.0.ebuild
+++ b/dev-python/dulwich/dulwich-0.12.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
@@ -21,6 +21,8 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/gevent[$(python_gen_usedep python2_7)] )"
 RDEPEND=""
+# https://github.com/jelmer/dulwich/pull/418
+PATCHES=( "${FILESDIR}/${P}-fix-gzip-hang.patch" )
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/dulwich/files/dulwich-0.12.0-fix-gzip-hang.patch b/dev-python/dulwich/files/dulwich-0.12.0-fix-gzip-hang.patch
new file mode 100644
index 000000000000..3feed01181ed
--- /dev/null
+++ b/dev-python/dulwich/files/dulwich-0.12.0-fix-gzip-hang.patch
@@ -0,0 +1,27 @@
+From 6ba8bba4f41ca9a2a4f7568ad45cabd41d7c9964 Mon Sep 17 00:00:00 2001
+From: Jonas Haag <jonas@lophus.org>
+Date: Tue, 12 Apr 2016 15:40:38 +0200
+Subject: [PATCH] Fix hang on Gzip decompression
+
+'LimitedInputFilter' should be applied before the Gzip middleware as
+'CONTENT_LENGTH' refers to the size of the *compressed* body.  If
+applied in wrong order, this may cause 'copyfileobj()' to try to read
+more data from the socket than is available, resulting in a call to
+'recv()' that hangs forever.
+---
+ dulwich/web.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dulwich/web.py b/dulwich/web.py
+index a4fa941..d8863fe 100644
+--- a/dulwich/web.py
++++ b/dulwich/web.py
+@@ -415,7 +415,7 @@ def make_wsgi_chain(*args, **kwargs):
+     correctly wrapped with needed middleware.
+     """
+     app = HTTPGitApplication(*args, **kwargs)
+-    wrapped_app = GunzipFilter(LimitedInputFilter(app))
++    wrapped_app = LimitedInputFilter(GunzipFilter(app))
+     return wrapped_app
+ 
+ 
diff --git a/dev-python/dulwich/metadata.xml b/dev-python/dulwich/metadata.xml
index 4447ab4fc9f1..989b825f1436 100644
--- a/dev-python/dulwich/metadata.xml
+++ b/dev-python/dulwich/metadata.xml
@@ -12,5 +12,6 @@
   <upstream>
     <remote-id type="pypi">dulwich</remote-id>
     <remote-id type="github">jelmer/dulwich</remote-id>
+    <bugs-to>https://github.com/jelmer/dulwich/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/escape_utils/Manifest b/dev-ruby/escape_utils/Manifest
index bac9edc106c1..a71039927bf9 100644
--- a/dev-ruby/escape_utils/Manifest
+++ b/dev-ruby/escape_utils/Manifest
@@ -1 +1,2 @@
 DIST escape_utils-1.2.0.gem 26624 SHA256 05497be965b95971c8bdf393c0cc851e7beefbf0061af66d820c20535ebcb2ab SHA512 82548f9f81de9a77f16789859b24c77313ab7c8a5a8e2040eba9f140f60247a1f83946d320fd07a4afef670c53f3a2c86bf0b2085749d526e1442fc2fa9074b3 WHIRLPOOL 52125b0eefe57840035b0085cea185a9ccf5ba9f7c1cafc4c69e7bbc81c70c5ce01a88c57d8b3bd2d16ad601585eb5a2235983c02455eb1853fa0536d3fba4a3
+DIST escape_utils-1.2.1.gem 27136 SHA256 e5292fe8d7e12a9bcb4502d99e28fb602e4e1514690d98a1c4957f6f77b4b162 SHA512 e410777cfdd5004168db6134f30a91e29b71136d3e7ec1a312f7307e0593c310230887a63ed25aa4f899b71b5cb78b15f833e4db6f1ca0cc99091ab0c0e6ba75 WHIRLPOOL 48cfbd373e6e752bc9a2476bd7ec8f3f31edc227e08e27b2c1930b3c10096ceb2ff7b0d532340fb48c6b4b254162de76dc2a595010b570c621fb0762b2ce4d56
diff --git a/dev-ruby/escape_utils/escape_utils-1.2.1.ebuild b/dev-ruby/escape_utils/escape_utils-1.2.1.ebuild
new file mode 100644
index 000000000000..386278b2f622
--- /dev/null
+++ b/dev-ruby/escape_utils/escape_utils-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster string escaping routines for your ruby apps"
+HOMEPAGE="https://github.com/brianmario/escape_utils"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" test/helper.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/escape_utils extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/escape_utils
+	cp ext/escape_utils/escape_utils$(get_modname) lib/escape_utils || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['test/**/*_test.rb'].each {|f| require f}" || die
+}
diff --git a/dev-ruby/jmespath/Manifest b/dev-ruby/jmespath/Manifest
index 6e7ef0c77977..9cf75ba5b4cb 100644
--- a/dev-ruby/jmespath/Manifest
+++ b/dev-ruby/jmespath/Manifest
@@ -1,2 +1,3 @@
 DIST jmespath-1.1.3.tar.gz 34314 SHA256 2c987327ab21bdab28b310cd3696af9cdf2e6264b0174ee40ecfd26d855c02b4 SHA512 ea76eb9fcda4cae9a874d120c81c9dc6bea0a7988287a88c9dabedc3755c9ce3ccea7a485de76d00a0e010f4f534fefa6acc99f865e370c7788b40ec10181fcf WHIRLPOOL aec4eb9fb25026e43de99da4403a12db170a9b841c5cd40d38f6a01acc4574eed9c798a57fd19c8991838d9009ccda62c701154689e8157f29e9546d3752e020
 DIST jmespath-1.2.2.tar.gz 38801 SHA256 0425a2b8e39f129edd0827cfa995a4e5176dc6af7dc702b7f2474ab91951bab1 SHA512 4af9cf3100b31304428cf7bea4d479157a08504b6a19e045aa9f52c45f591563fa9e18f385ae8fb24783e20756ad4bebf62c50e4d7b08f932661f2e77e2cb824 WHIRLPOOL d59fc2de76188a3739a5cf60111ef1230978034e83637ad2c8fedea5b8842358b8b00c17fbc18402611fd96d045e4e7a0cee04279e0a39c8b31a858bb7d1ac3f
+DIST jmespath-1.2.4.tar.gz 39134 SHA256 5afc8c54de936bd533623ccbe4fc4057b9f0ec189fea81f46f0b5824372d3f95 SHA512 338e4c732285f92a958ccc6b7a347943443c147ae2ac17de4858363a6764928298beb077f081ef613bcf4a9ed30a5fefd57d9191d3764d392a418ed3d2150cae WHIRLPOOL 7ae65fd1d0a7d53ca1ecc62ff84cba75be23df58106e3be947d94bd07827e089f17a5df1aebd342ec579c282e1db082e839124c99ffda5e3cc6bb455e850d7cd
diff --git a/dev-ruby/jmespath/jmespath-1.2.4.ebuild b/dev-ruby/jmespath/jmespath-1.2.4.ebuild
new file mode 100644
index 000000000000..e6d7fd1187ad
--- /dev/null
+++ b/dev-ruby/jmespath/jmespath-1.2.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements JMESPath for Ruby"
+HOMEPAGE="https://github.com/jmespath/jmespath.rb"
+SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}.rb-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' \
+		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
+}
diff --git a/dev-ruby/png/Manifest b/dev-ruby/png/Manifest
index 0cf95888f114..abb0de286e6a 100644
--- a/dev-ruby/png/Manifest
+++ b/dev-ruby/png/Manifest
@@ -1,2 +1 @@
-DIST png-1.2.0.gem 19968 SHA256 1b8a3b4a2d76341a4e1d2ed64180d70d463e1e6538a9b45ce319b53c2f4dbd1a SHA512 c8b70697a38766dd6fd5057bd998d41a33caf61780f0bbcc908ed8f76378a79f441bcdd89ae5aad83780acb3de6113165bbf104b110bb7ae83226c15a13bda44 WHIRLPOOL cb278beea767f69f57501ea7f6742097c14ebd4cbfc26fa57cda12ae27837b51eaa0475e25431f8f7feb46b2bd5b8210e7ee2fe0b157091ec959ed1756d64837
 DIST png-1.2.1.gem 22016 SHA256 678235c7c6f1194ec9d3690035044df6820ba41a9d995b73f63d3e8a8926e737 SHA512 307d302d536f195255e0c192e54cce219314c053dd59b88b881c4c9df8d3f1e733c7874c40d5e7db8fe32649dc84dd40dbfc79c5ca31f79e6b98f35af1b40561 WHIRLPOOL 04f2d96d881e2c4889f15cf97af7bcd100d8ab73f8e38eac65635c27c0c4a3c9f93da87f4d00782bf62becfcf444a19a5168f40dc9fc9e9b506f654a023e568a
diff --git a/dev-ruby/png/png-1.2.0-r2.ebuild b/dev-ruby/png/png-1.2.0-r2.ebuild
deleted file mode 100644
index 18c147888c2e..000000000000
--- a/dev-ruby/png/png-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An almost pure-Ruby Portable Network Graphics (PNG) library"
-HOMEPAGE="http://rubyforge.org/projects/seattlerb/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/hoe )
-	test? (
-		dev-ruby/hoe
-		dev-ruby/minitest
-	)"
-
-ruby_add_rdepend ">=dev-ruby/RubyInline-3.5.0"
-
-all_ruby_prepare() {
-	sed -i -e "/rubyforge/s/^/#/" Rakefile || die
-	sed -i -e "1i# encoding: ascii-8bit" test/test_png.rb || die
-}
-
-src_test() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home."
-	ruby-ng_src_test
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r example
-}
diff --git a/dev-ruby/png/png-1.2.1.ebuild b/dev-ruby/png/png-1.2.1.ebuild
index e177aff8205a..435bf2139600 100644
--- a/dev-ruby/png/png-1.2.1.ebuild
+++ b/dev-ruby/png/png-1.2.1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
 
 inherit ruby-fakegem
@@ -20,9 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "
-	doc? ( dev-ruby/hoe )
 	test? (
-		dev-ruby/hoe
 		dev-ruby/minitest
 	)"
 
@@ -38,6 +35,10 @@ src_test() {
 	ruby-ng_src_test
 }
 
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
 all_ruby_install() {
 	all_fakegem_install
 
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild
index a6bd8b71ec37..ac9b6a178232 100644
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild
+++ b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_DOCDIR="rdoc"
 
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 2798fa5c6690..e9713dc4761e 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,4 +1,4 @@
 DIST ideaIU-141.3057.6.tar.gz 327591445 SHA256 4ffdd7e5e78526222d1a9164e8e66912e6126f32e395016e843b6fdc433203b3 SHA512 2e8058d5f799199114bee88fec56beca97ae444f0b5447c2019da9b4030be14252a9fabb072fb6a7145d661502c9a6965690b7d4c3b3a13c7bee62f66796790d WHIRLPOOL 3f6e8e3bd565ff4444cfd1b1b2c2114da7ca9dbc931a8d886928f03a62e28128ea9aa9976f4df3a9993d15f67ce299af78dac158c2ab752e3b889b4daf88cdf1
 DIST ideaIU-143.2332.3.tar.gz 396603145 SHA256 22dbf3e541634050ce9a73159889998efff30674ce0c019ac2e05eb72a2b6cc3 SHA512 9297c9facdf504ef922264a9ece826641880d9cc8464ba40a32e3d8549fabb11c2e03680d4215d6ef9d5e2f80d03b9a43be557604d9008986359e2b0cc28356b WHIRLPOOL 429c6d92c88b8c9bd5b836027cc325d512f572839f2efea063387d027fa8335ba3865b6de19fb29b44c3fcb50635ecdfe3828721a4714cc5143604b0b6d13b1c
-DIST ideaIU-145.258.11.tar.gz 449590439 SHA256 eb0fef2d110d99ccff34883e3b0ebd32a4c6503af3af13711c9187307cc3cb97 SHA512 73c27b09ce1c7567241a0c55a8788a939668bd9c2f495901c3e99cce12d60636784bd26a478747650b5bb14494cd1a58dd3cf1ca9cb839c8b191208ed7592c16 WHIRLPOOL dd85f425d3c34d8225153aa3c3535aa2d455e09cf0f84a9825abf9b7d722fcb1d61700e4ce916144893873a9f7cce70f8842665ef2ebc0bf89dd3b04a1f6f643
 DIST ideaIU-145.597.3.tar.gz 450241312 SHA256 d5a7d2d657fe2ad170716054c6ccd164e509cf50ee6eee8b61fe3490071940df SHA512 3fb9cdea46977c737d2d64b34b2fd1f9f68c06592fd0c59c1651f3aa78d057f7e0b554fd1ff5a7a1d05a439359780147f1d28bed7257ad05e98d312737cad61e WHIRLPOOL 7040a10577325b6e672a50404bf95f30c9c5225a734f3bfd88e6e1dcbcec9c69ac8917b286c0e355c606546ff6e9a07b87aebbe9ecd6612683eb5ec93420d7f0
+DIST ideaIU-145.844.1.tar.gz 450461375 SHA256 92b81a3c107694bd1a4d04c73e54782894701a1c33a005d248f17f146af2225a SHA512 7828ae0379c2d5f0da269dec28ee72505df691a651e1ce729e53cb139c74828c6406f5a697ac984ce93c6932cd538a6fd9f5de3a253687efba502b8d348c2bc9 WHIRLPOOL 13ef180180083b7b6b0fff9f27aef1e82893b17b0e84147555945191292430cd1a005bb27275d239e3a1af87c29a5859bbe9aa56f7ee0fd26e08510bf5815379
diff --git a/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3.ebuild
similarity index 91%
rename from dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3_pre.ebuild
rename to dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3.ebuild
index af33d7922235..5ead703ea99b 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3_pre.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3.ebuild
@@ -15,14 +15,15 @@ if [[ "$(get_version_component_range 7)x" = "prex" ]]
 then
 	# upstream EAP
 	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
 else
 	# upstream stable
 	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
 HOMEPAGE="https://www.jetbrains.com/idea"
-SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
 
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
diff --git a/dev-util/idea-ultimate/idea-ultimate-2016.1.0.145.258.11.ebuild b/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.844.1_pre.ebuild
similarity index 88%
rename from dev-util/idea-ultimate/idea-ultimate-2016.1.0.145.258.11.ebuild
rename to dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.844.1_pre.ebuild
index 07eeb4d52f06..5ead703ea99b 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2016.1.0.145.258.11.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.844.1_pre.ebuild
@@ -11,18 +11,19 @@ MY_PV="$(get_version_component_range 1-3)"
 MY_PN="idea"
 
 # distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 6)x" = "prex" ]]
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
 then
 	# upstream EAP
 	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
 else
 	# upstream stable
 	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
 HOMEPAGE="https://www.jetbrains.com/idea"
-SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
 
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 6e9a31f33c3d..b1146da628b9 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,2 @@
-DIST radare2-0.10.0.tar.xz 4827432 SHA256 f7a755e4ff2d5fb9258be6c9b7ffa708b0533e0d1efce4ced177785a9270befd SHA512 16c386122dfa55377fb2d4626235c47648ec36ef080aaf3bd50c20218659a2014f56e1939b6b837f469748b7ac32d8f3f36c7ce9242761dcb4589a3c0bcc524c WHIRLPOOL 518efb3c0cf45096644d8dd4394727ea0cb85c72a8d23e59ae43c06a1d50dc4d9e7f00d8a32410c1ff6c5fda75331b52877fe2f149191dfe5f5ca981cd47371a
 DIST radare2-0.10.1.tar.xz 4912104 SHA256 5ac02717786f2ff3b5326927351d5ca38464da89675c8edfb4ded43addb22987 SHA512 33cfc1f43a1571c7d8104394f3996dac7a6a5580e766ee206478caf03b4e618d4d35127b21b1164df09b9af0a7b577621c4ce717d6c0d761ab907d5cb8d59268 WHIRLPOOL 7385ab6cd64f70359b1ad246cbe7f21f579bee0a0656724d7128a0d76d9a111082f2d620841eb747bb8d4641eeb3aee17d1fc9cd2a04eada399d719c7492c21b
-DIST radare2-0.9.8.tar.xz 4614588 SHA256 8e72caaebdac10300fd7ec86a5d06b1cbecfc6914e5fea4007c6e06e667bfa5a SHA512 8a3b1811c994a520eb5758a11eceffdaa999bb69b5252e45148813a7c36d11e0afd8c83d6f03bc2282c526b630979edc20bed050cb119300dc353ee039a99355 WHIRLPOOL 09ec20978b18f16162100ef3277f01d0dd547779dfb350fac4ea0200cdec58b317aef8f976aa881d37db21a5c8aae0ca53577fc3a3420c20d835d40f4aaa92bb
-DIST radare2-0.9.9.tar.xz 4318304 SHA256 024adba5255f12e58c2c1a5e2263fada75aad6e71b082461dea4a2b94b29df32 SHA512 6ea9396f59a5f61d7d433bc2eceb093526112c58114e2c7d83127d52442e376fbb4277d44447c252c9ba99d1ad1d966a06a6a0d5049660ef330029e2facb4cc9 WHIRLPOOL a349edaf1fea30117a13cb07f59f0798ab4c11fa13bf068a22a574a87b42fef0e695db3d87d42dc32c2e6658688887398e1ad8de85a5558c4b2116c81eebad67
+DIST radare2-0.10.2.tar.xz 5055040 SHA256 1bc9ce6f5d6bec366324bc542653bba5c1b89a6980c17253ec3a1f75264beb3b SHA512 437e8fcef7429e294a199030b6cc4401b824262211d512f69b8718d41ff5aa270868e812ecaf6fe22d5fbb14715e7e89d7a13d16a70d68e0bd37e582327ac4f7 WHIRLPOOL 54246864af0ff314140db16a4a20aa3bbe1698bb91766a516f652a3436b18e0953f8be4734ca535fd56b1b5172796742ecc20126c072db4fc9e014f84075f08f
diff --git a/dev-util/radare2/radare2-0.10.0.ebuild b/dev-util/radare2/radare2-0.10.2.ebuild
similarity index 100%
rename from dev-util/radare2/radare2-0.10.0.ebuild
rename to dev-util/radare2/radare2-0.10.2.ebuild
diff --git a/dev-util/radare2/radare2-0.9.8.ebuild b/dev-util/radare2/radare2-0.9.8.ebuild
deleted file mode 100644
index bf31827e4a17..000000000000
--- a/dev-util/radare2/radare2-0.9.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://www.radare.org/get/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ssl"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_enable debug)
-}
diff --git a/dev-util/radare2/radare2-0.9.9.ebuild b/dev-util/radare2/radare2-0.9.9.ebuild
deleted file mode 100644
index 7998add0cbfb..000000000000
--- a/dev-util/radare2/radare2-0.9.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
-HOMEPAGE="http://www.radare.org"
-SRC_URI="http://www.radare.org/get/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ssl"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.9-nogit.patch
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_enable debug)
-}
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 368af3766ae9..46fd62fbfa66 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -52,12 +52,21 @@ esac
 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 
 HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
 QT5_MINOR_VERSION=$(get_version_component_range 2)
 readonly QT5_MINOR_VERSION
 
-SLOT="5"
+if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
+	LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+else
+	LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
+fi
+
+if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+	SLOT=5/$(get_version_component_range 1-2)
+else
+	SLOT=5
+fi
 
 case ${PV} in
 	5.9999)
@@ -74,14 +83,14 @@ case ${PV} in
 		# development release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
+		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
 		# official stable release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
-		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac
@@ -127,23 +136,23 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	local gcc_version_check_fatal=false
 	local min_gcc4_minor_version=5
-	if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-		gcc_version_check_fatal=true
-	fi
 	if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
 		min_gcc4_minor_version=7
 	fi
 	if [[ $(gcc-major-version) -lt 4 ]] || \
 	   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
-		if ${gcc_version_check_fatal}; then
-			die "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+		if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+			die "GCC 4.${min_gcc4_minor_version} or later required"
 		else
+			ewarn
 			ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported"
+			ewarn
 		fi
 	fi
 
+	# bug 307861
 	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
@@ -151,7 +160,6 @@ qt5-build_src_unpack() {
 			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
 			ewarn "You may experience really long compilation times and/or increased memory usage."
 			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn "For more info check out https://bugs.gentoo.org/307861"
 			ewarn
 		fi
 		eshopts_pop
@@ -180,29 +188,27 @@ qt5-build_src_prepare() {
 		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
 			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
 			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
-			-e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
+			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
 			configure || die "sed failed (respect env for qmake build)"
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
 			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
 
-		# Respect CXX in {bsymbolic_functions,fvisibility,precomp}.test
+		# Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect toolchain and flags in config.tests
 		find config.tests/unix -name '*.test' -type f -execdir \
-			sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die
+			sed -i -re '/(bin\/qmake|QMAKE")/ s/-nocache //' '{}' + || die
+
+		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
+		# compiler support for extended instruction sets (bug 552942)
+		find config.tests/common -name '*.pro' -type f -execdir \
+			sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
 
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
-
-		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
-		# compiler support for extended instruction sets (bug 552942)
-		if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
-			find config.tests/common -name '*.pro' -type f -execdir \
-				sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
-		fi
 	fi
 
 	if [[ ${EAPI} == 5 ]]; then
@@ -269,7 +275,15 @@ qt5-build_src_install() {
 	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
-		set -- emake INSTALL_ROOT="${D}" install_{global_docs,mkspecs,qmake,syncqt}
+		local qmake_install_target=install_qmake
+		if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
+			# qmake/qmake-aux.pro
+			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
+		fi
+
+		set -- emake INSTALL_ROOT="${D}" \
+			${qmake_install_target} \
+			install_{syncqt,mkspecs,global_docs}
 		einfo "Running $*"
 		"$@"
 
@@ -536,14 +550,7 @@ qt5_base_configure() {
 		# obsolete flag, does nothing
 		#-qml-debug
 
-		# extended instruction sets support
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse2   && echo -no-sse2)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse3   && echo -no-sse3)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-ssse3  && echo -no-ssse3)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.1 && echo -no-sse4.1)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.2 && echo -no-sse4.2)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx    && echo -no-avx)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx2   && echo -no-avx2)
+		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)
 		$(is-flagq -mno-dspr2 && echo -no-mips_dspr2)
 
@@ -560,9 +567,8 @@ qt5_base_configure() {
 		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog)
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
-		-no-openssl
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-{x11,evdev})
+		-no-openssl -no-libproxy
+		-no-xkbcommon-x11 -no-xkbcommon-evdev
 		-no-xinput2 -no-xcb-xlib
 
 		# don't specify -no-gif because there is no way to override it later
@@ -593,10 +599,7 @@ qt5_base_configure() {
 		-iconv
 
 		# disable everything to prevent automagic deps (part 3)
-		-no-cups -no-evdev
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib)
-		-no-icu -no-fontconfig
-		-no-dbus
+		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
 
 		# let portage handle stripping
 		-no-strip
@@ -641,10 +644,10 @@ qt5_base_configure() {
 		-no-opengl -no-egl
 
 		# disable libinput-based generic plugin by default, override in qtgui
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput)
+		-no-libinput
 
 		# disable gstreamer by default, override in qtmultimedia
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer)
+		-no-gstreamer
 
 		# use upstream default
 		#-no-system-proxies
diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest
index 30678d89d9b0..39565fbf3307 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1 +1,2 @@
 DIST armagetronad-0.2.8.3.2.src.tar.bz2 1841407 SHA256 f444e481de94e6c0e3933c709d46effd2adfe823f5ef44768adcc8003b8ba7c5 SHA512 ffe16d55d4ea3c9e3f4f8828a9ffb09274b20a33c6d5c91cccbe846fa93f7d1d78e565db3c9403debf9f7bfde76322477a84349d85b475ed20c184da281107a4 WHIRLPOOL f04902c7bf3b13ec35497202a658ef96846b59d4245c72a17793b186d06a8f2d2dc1960b563b785cfb46aa9e2252a8ba22436df44e4ccfa2e8c872b4eb51eb4a
+DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 SHA256 ddf2d781b134392e9667f17e0319ae2117c20e6eb7738e3cacd701f3608ea5e8 SHA512 05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f WHIRLPOOL 731b3e8d8647948e016e4dbfa3733f666838d0b4e47f997e149b947741d3b566d9aa1492dc570064e0005c92b0c04f4c74ad4a0278ff7018b028d9c431af135d
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
new file mode 100644
index 000000000000..c292cc139f24
--- /dev/null
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
+HOMEPAGE="http://armagetronad.org/"
+SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated sound"
+
+RDEPEND="
+	dev-libs/libxml2
+	!dedicated? (
+		media-libs/libpng:0
+		media-libs/sdl-image[jpeg,png]
+		virtual/glu
+		virtual/opengl
+		media-libs/libsdl[X,opengl,video]
+		sound? (
+			media-libs/libsdl[sound]
+			media-libs/sdl-mixer
+		)
+	)"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+	sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
+}
+
+src_configure() {
+	# --enable-games just messes up paths
+	egamesconf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable dedicated) \
+		$(use_enable sound music) \
+		--disable-sysinstall \
+		--disable-useradd \
+		--disable-uninstall \
+		--disable-games
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+
+	# misplaced desktop-file/icons
+	rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
+	doicon -s 48 desktop/icons/large/armagetronad.png
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index bb3500f2f21a..291269272ae9 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1 +1,2 @@
 DIST stella-4.0-src.tar.gz 2283736 SHA256 bc3445109a090360070644f249b7b6c8f73b6044606d77d65303538785d426c9 SHA512 42df4429dfbfc268e7b7d1c538641b443703ba2af4ad4e66b9df05f2b7d62a860a1895f738d95a3a0b879052865137d31a22b8611f3b93ff9746649553c099fa WHIRLPOOL f0e1433a509724f0a5725aefbd1bb277729e985a173551051c2bf39eeb279f19053f14d6fa384f1a0104de9d0f9cd6f49ffe84347fcd59edb42189e681772a95
+DIST stella-4.7.2-src.tar.xz 1715332 SHA256 b2727a0e2d3b112d35dcb89b4bdc789e2c7f15e9d9c7054a69a2f67facd7416e SHA512 dcfaba9b554ab08c9ba79c8e95551bc688fae4ab0ab368df11c05f3dc7c9431d32068d5dd658ec4d1aa8cb826c7205fc4f301145a149d32369833409992455e2 WHIRLPOOL 5eb23541879b82083784054cc6783a55f7c70533a03747f7b5b5fec6632bb0b6062c9a530a6d5e98552749c8e22de8cbf08254407cdd3b6281a7f4aae74cb514
diff --git a/games-emulation/stella/stella-4.7.2.ebuild b/games-emulation/stella/stella-4.7.2.ebuild
new file mode 100644
index 000000000000..7d23b1fb3477
--- /dev/null
+++ b/games-emulation/stella/stella-4.7.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Stella Atari 2600 VCS Emulator"
+HOMEPAGE="http://stella.sourceforge.net/"
+SRC_URI="mirror://sourceforge/stella/${P}-src.tar.xz"
+
+LICENSE="GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="joystick"
+
+DEPEND="media-libs/libsdl2[joystick?,opengl,video]
+	media-libs/libpng:0
+	sys-libs/zlib"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL/s/-s //' \
+		-e '/STRIP/d' \
+		-e "/icons/d" \
+		-e '/INSTALL.*DOCDIR/d' \
+		-e '/INSTALL.*\/applications/d' \
+		-e '/CXXFLAGS+=/s/-fomit-frame-pointer//' \
+		Makefile || die
+}
+
+src_configure() {
+	# not an autoconf script
+	./configure \
+		--prefix="/usr" \
+		--bindir="${GAMES_BINDIR}" \
+		--docdir="/usr/share/doc/${PF}" \
+		--datadir="${GAMES_DATADIR}" \
+		$(use_enable joystick) \
+		|| die
+}
+
+src_install() {
+	local i
+
+	DOCS="Announce.txt Changes.txt Copyright.txt README-SDL.txt Readme.txt Todo.txt" \
+		default
+
+	for i in 16 22 24 32 48 64 128 ; do
+		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
+	done
+	domenu src/unix/stella.desktop
+	dohtml -r docs/*
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/drumstick/drumstick-1.0.2.ebuild b/media-sound/drumstick/drumstick-1.0.2.ebuild
index 82ac2f2499e0..47cd4af4bd6c 100644
--- a/media-sound/drumstick/drumstick-1.0.2.ebuild
+++ b/media-sound/drumstick/drumstick-1.0.2.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils fdo-mime gnome2-utils
 
-DESCRIPTION="Qt4/C++ wrapper for ALSA sequencer"
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d62f20fc6aca..4dc998984213 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Apr 2016 19:39:40 +0000
+Wed, 13 Apr 2016 05:09:26 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 20081ef9741a..4dc998984213 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Apr 2016 19:39:41 +0000
+Wed, 13 Apr 2016 05:09:26 +0000
diff --git a/metadata/md5-cache/app-admin/entr-3.4 b/metadata/md5-cache/app-admin/entr-3.4
deleted file mode 100644
index b0efce5de894..000000000000
--- a/metadata/md5-cache/app-admin/entr-3.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install test unpack
-DESCRIPTION=Run arbitrary commands when files change
-EAPI=5
-HOMEPAGE=http://entrproject.org/
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://entrproject.org/code/entr-3.4.tar.gz
-_md5_=a8066062945efda4a690b3c433847aba
diff --git a/metadata/md5-cache/app-admin/entr-3.3 b/metadata/md5-cache/app-admin/entr-3.5
similarity index 66%
rename from metadata/md5-cache/app-admin/entr-3.3
rename to metadata/md5-cache/app-admin/entr-3.5
index db2495c61fde..c314fba8db35 100644
--- a/metadata/md5-cache/app-admin/entr-3.3
+++ b/metadata/md5-cache/app-admin/entr-3.5
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure install test unpack
 DESCRIPTION=Run arbitrary commands when files change
-EAPI=5
+EAPI=6
 HOMEPAGE=http://entrproject.org/
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=ISC
 SLOT=0
-SRC_URI=http://entrproject.org/code/entr-3.3.tar.gz
-_md5_=a8066062945efda4a690b3c433847aba
+SRC_URI=http://entrproject.org/code/entr-3.5.tar.gz
+_md5_=736e9205039eea9181378d9fccdaf10c
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.3-r1 b/metadata/md5-cache/app-shells/bash-completion-2.3-r2
similarity index 95%
rename from metadata/md5-cache/app-shells/bash-completion-2.3-r1
rename to metadata/md5-cache/app-shells/bash-completion-2.3-r2
index 8576fbd861e0..aaf54468f36c 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.3-r1
+++ b/metadata/md5-cache/app-shells/bash-completion-2.3-r2
@@ -10,4 +10,4 @@ RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bas
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4a694085d020e52325d092050d40483b
+_md5_=f3d06941e00e1128c8599788f6d0a918
diff --git a/metadata/md5-cache/app-text/tidy-html5-5.2.0 b/metadata/md5-cache/app-text/tidy-html5-5.2.0
new file mode 100644
index 000000000000..86e2109a0254
--- /dev/null
+++ b/metadata/md5-cache/app-text/tidy-html5-5.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Tidy the layout and correct errors in HTML, HTML5 and XML documents
+EAPI=6
+HOMEPAGE=http://www.html-tidy.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!app-text/htmltidy
+SLOT=0
+SRC_URI=https://github.com/htacg/tidy-html5/archive/5.2.0.zip -> tidy-html5-5.2.0.zip
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a196366204cad9791eee93fdf6bf0887
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.0.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.0.0-r1
similarity index 98%
rename from metadata/md5-cache/dev-java/icedtea-bin-3.0.0
rename to metadata/md5-cache/dev-java/icedtea-bin-3.0.0-r1
index f8e29ae2f8ca..57de131d52de 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.0.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.0.0-r1
@@ -13,4 +13,4 @@ RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.0.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.0.0.tar.xz ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.0.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.0.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.0.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.0.0-arm.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.0.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.0.0-x86.tar.xz ) )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=32c60a664106a1e5d293ed97ff800aa3
+_md5_=cadc92e3879515e518ba7744131f783f
diff --git a/metadata/md5-cache/dev-perl/PAR-1.5.0-r1 b/metadata/md5-cache/dev-perl/PAR-1.5.0-r1
deleted file mode 100644
index 2ec6295db57b..000000000000
--- a/metadata/md5-cache/dev-perl/PAR-1.5.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-AutoLoader >=virtual/perl-IO-Compress-1.30 >=dev-perl/Archive-Zip-1.00 >=dev-perl/PAR-Dist-0.32 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl Archive Toolkit
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/PAR/
-KEYWORDS=amd64 x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-AutoLoader >=virtual/perl-IO-Compress-1.30 >=dev-perl/Archive-Zip-1.00 >=dev-perl/PAR-Dist-0.32 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-1.005.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=d3cf319957e039be20f538cbc27ba973
diff --git a/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.180.0 b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.180.0
new file mode 100644
index 000000000000..acc22786f6c6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.180.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-File-Temp virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-IO >=virtual/perl-Test-Simple-0.940.0 dev-perl/Test-Warn ) dev-lang/perl:=
+DESCRIPTION=A simple parallel processing fork manager
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Parallel-ForkManager/
+IUSE=test minimal examples
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-File-Path virtual/perl-File-Temp virtual/perl-Storable dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-1.18.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0
+_md5_=6e992c05fa0941cb89238f87ca001ea6
diff --git a/metadata/md5-cache/dev-perl/Parallel-Prefork-0.140.0-r1 b/metadata/md5-cache/dev-perl/Parallel-Prefork-0.140.0-r1
deleted file mode 100644
index 2ef989e49c80..000000000000
--- a/metadata/md5-cache/dev-perl/Parallel-Prefork-0.140.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Proc-Wait3-0.30.0 dev-perl/List-MoreUtils >=dev-perl/Class-Accessor-Lite-0.40.0 dev-perl/Scope-Guard >=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( dev-perl/Test-Requires dev-perl/Test-SharedFork ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A simple prefork server framework
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Parallel-Prefork/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Proc-Wait3-0.30.0 dev-perl/List-MoreUtils >=dev-perl/Class-Accessor-Lite-0.40.0 dev-perl/Scope-Guard dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.14.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	461f1d9eb930e8d1b178a39e83635fd0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=8aa7575a647d01a72b14c2a9a36c2174
diff --git a/metadata/md5-cache/dev-python/dulwich-0.12.0 b/metadata/md5-cache/dev-python/dulwich-0.12.0
deleted file mode 100644
index 68d95a6bb29d..000000000000
--- a/metadata/md5-cache/dev-python/dulwich-0.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
-EAPI=5
-HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/dulwich/dulwich-0.12.0.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=31546a173f24d6cd26a0f36431c19080
diff --git a/metadata/md5-cache/dev-python/dulwich-0.12.0-r1 b/metadata/md5-cache/dev-python/dulwich-0.12.0-r1
new file mode 100644
index 000000000000..e048ee587c54
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dulwich-0.12.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
+EAPI=6
+HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/d/dulwich/dulwich-0.12.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=018d9c3daa08a0f99cf340640928be84
diff --git a/metadata/md5-cache/dev-qt/assistant-5.5.1-r1 b/metadata/md5-cache/dev-qt/assistant-5.5.1-r1
index a447588dd2f8..c1f8b6bd8e25 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/assistant-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qthelp-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtprintsupport-5.5.1 ~dev-qt/qtsql-5.5.1[sqlite] ~dev-qt/qtwidgets-5.5.1 webkit? ( ~dev-qt/qtwebkit-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=be74f7f56f5ca0b24804703cdf44fbb5
diff --git a/metadata/md5-cache/dev-qt/designer-5.5.1-r1 b/metadata/md5-cache/dev-qt/designer-5.5.1-r1
index 5f8b66067cf6..0a94df863ecb 100644
--- a/metadata/md5-cache/dev-qt/designer-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/designer-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtprintsupport-5.5.1 ~dev-qt/qtwidgets-5.5.1 ~dev-qt/qtxml-5.5.1 declarative? ( ~dev-qt/qtdeclarative-5.5.1[widgets] ) webkit? ( ~dev-qt/qtwebkit-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=a63bee00d31532199808be26af2c5512
diff --git a/metadata/md5-cache/dev-qt/linguist-5.5.1-r1 b/metadata/md5-cache/dev-qt/linguist-5.5.1-r1
index 47e54cea445e..0c41c9fddfbf 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/linguist-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtprintsupport-5.5.1 ~dev-qt/qtwidgets-5.5.1 ~dev-qt/qtxml-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=657c0e56862b6851f34861612c8289dd
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.5.1-r1 b/metadata/md5-cache/dev-qt/linguist-tools-5.5.1-r1
index 1edf2c6fc1e0..6470d738becf 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtxml-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=717adfdd2ab79e0596040fb15c7b5b06
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1 b/metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1
index 916ba6ce7dfd..ac6504700d45 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtwidgets-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=e041ce57a7f68ed5ee6bcc6165bc751d
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.5.1-r1 b/metadata/md5-cache/dev-qt/qdbus-5.5.1-r1
index 58a8458d99ad..9c39674445c6 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 ~dev-qt/qtxml-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=49cd9473ff12980f962190dc200f5ebb
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1-r1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1-r1
index 10c650a7c03d..31ccb442acb2 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 ~dev-qt/qtxml-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=ff66fbd82c2a3e2425a0fd07a1cd8ada
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.5.1 b/metadata/md5-cache/dev-qt/qdoc-5.5.1
index 062116debc3e..7556ec91d158 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.5.1
+++ b/metadata/md5-cache/dev-qt/qdoc-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtxml-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=3d6e548f39c3893d6aea5e36308d717d
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
index cf3d786ab6f2..636b89451f88 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.5.1 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtdbus-5.5.1 >=net-wireless/bluez-5 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=7994942b2c4c7bbf73b81f72ab1cc217
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.5.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.5.1
index e5becf1cc994..ec3876c1be74 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=79e2b443a45d61369173a5526c9dd85b
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtcore-5.5.1-r1
index 1625e51d2961..63f5cf2de273 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtcore-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.35[pcre16] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=d01ea2838b2c6c0ff4cc31ce3dc75839
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.5.1 b/metadata/md5-cache/dev-qt/qtdbus-5.5.1
index ac774f186e04..a5a5d760d954 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=2f918c49c7778f57ec4756a8cb63a90a
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1-r1
index 4040d9889f57..6a7f92dc4b12 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qttest-5.5.1 localstorage? ( ~dev-qt/qtsql-5.5.1 ) widgets? ( ~dev-qt/qtwidgets-5.5.1[gles2=] ) xml? ( ~dev-qt/qtxmlpatterns-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=28340f0b32d14260066103c296315544
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1
index 7898045018a7..14d3c6bef09d 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1[ssl=] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=48bb432f1877a0ecf036dd060a38b6c1
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1-r1
index 1162f18d7890..0a10b20de8a6 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdeclarative-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=9b77f12a8aecc19fca7117f28f5cb322
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.5.1-r1
index dda4d1663687..f35f2ff482f5 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.5.1-r1
@@ -11,6 +11,6 @@ RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.5.1 media-libs/fontconfig >=media-libs/
 REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=a03f5b3291bed24321be77cdf0071f3d
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.5.1-r1 b/metadata/md5-cache/dev-qt/qthelp-5.5.1-r1
index 7b7ff342d843..41f690461a7e 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtsql-5.5.1[sqlite] ~dev-qt/qtwidgets-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=e3e713187e5355377a1f34a82945c33d
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtimageformats-5.5.1-r1
index 2c970a2ccd73..02eabdafe169 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=320ef29c7d99aea575a6482e3a3f0845
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.5.1-r2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.5.1-r2
index db37c878c15a..5e00effc239e 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.5.1-r2
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.5.1-r2
@@ -10,6 +10,6 @@ RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 alsa? (
 REQUIRED_USE=?? ( gstreamer gstreamer010 )
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=4a32282a5ecbc08f4d3dd2da4e4718e9
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.5.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.5.1
index e7a9400904b4..d268946c252a 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.5.1 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.5.1 ) ssl? ( dev-libs/openssl:0[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=193b671eb5595d9ae012008767f9a9c0
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.5.1 b/metadata/md5-cache/dev-qt/qtopengl-5.5.1
index 231be0189390..81fe9fe5e130 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtwidgets-5.5.1[gles2=] virtual/opengl dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=febfb177297494672fde8e3a69f39d5a
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
index 5f782eccca43..88d618c84014 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=da30d46423884a57471efd381967e5c1
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtpositioning-5.5.1-r1
index 4dd7ebb4ea8c..74c74dafb79b 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( ~dev-qt/qtdeclarative-5.5.1 ~dev-qt/qtnetwork-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=8313aa1740bf4aebf24e12a77cc61192
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.5.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.5.1
index ace2cc074cca..68d0171049e2 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtwidgets-5.5.1[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=ac745d10f017cf3f86ddc0431926c699
diff --git a/metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1
index 488ab20b0b12..27e6e91fa8c6 100644
--- a/metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtnetwork-5.5.1 ~dev-qt/qtscript-5.5.1 ~dev-qt/qtsql-5.5.1 ~dev-qt/qtwidgets-5.5.1 designer? ( ~dev-qt/designer-5.5.1 ~dev-qt/qtdeclarative-5.5.1 ) opengl? ( ~dev-qt/qtgui-5.5.1[gles2=] ~dev-qt/qtopengl-5.5.1 ) webkit? ( ~dev-qt/qtwebkit-5.5.1 ) xml? ( ~dev-qt/qtxmlpatterns-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=e5186c2ab4258709f32c1a885268e06a
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1-r1
index 63f62de9ca97..584bae8b1503 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtdeclarative-5.5.1 ~dev-qt/qtgui-5.5.1 widgets? ( ~dev-qt/qtwidgets-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=4741c9a3de6c7bc903e64a53083a3821
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtscript-5.5.1-r1
index 932c5777977c..caee55a81bd7 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 scripttools? ( ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=dde4c14cda21ea7686346135f5118eeb
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1
index d77e85da26cd..c914c061db57 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=b411c9d125b990441e2e5779be8b076f
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtserialport-5.5.1-r1
index b077ce9a0206..95947b4ca720 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 virtual/udev dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=4c5544c6ab2c0e2727da4421d8295163
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.5.1 b/metadata/md5-cache/dev-qt/qtsql-5.5.1
index 6264a7c41881..cc46539fa4a0 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.5.1
@@ -10,6 +10,6 @@ RDEPEND=~dev-qt/qtcore-5.5.1 freetds? ( dev-db/freetds ) mysql? ( virtual/libmys
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=aa77d54d803c79a90b673fa39eacc106
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1
index 0e7d2595b87d..760f97524409 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1 ~dev-qt/qtwidgets-5.5.1 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=937835a07e5452141147368236a22f63
diff --git a/metadata/md5-cache/dev-qt/qttest-5.5.1 b/metadata/md5-cache/dev-qt/qttest-5.5.1
index 63e7d8f0d490..a6e841441c0c 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.5.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=8264fc392ce0c575b20c5eb497a96253
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.5.1-r1 b/metadata/md5-cache/dev-qt/qttranslations-5.5.1-r1
index 38532b77bb0e..5f1b6caa9830 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=3b027f2aa2fe4814d7bff4e1593daad1
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1
index 088334e14477..d263468eafea 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 wayland-compositor? ( qml? ( ~dev-qt/qtdeclarative-5.5.1 ) ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=680b1ce8eeeef08893eb0f95f888e0f9
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1-r1
index b22b86e5db62..dfcf71cb1559 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=20314d7e128703398d68874616880a01
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1
index a5b6220a181d..2ec6f06a72c4 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1
@@ -10,6 +10,6 @@ RDEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxm
 REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RESTRICT=mirror test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=bf3c4c174823a0ad6688580c7d07654e
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1-r1
index c8ff9b82613b..9961ff235e30 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtnetwork-5.5.1 qml? ( ~dev-qt/qtdeclarative-5.5.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=8a4edc8787b6d5e8b85afa75fc674009
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.5.1-r1
index caeeea1d030e..d7348008fdcc 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[gles2=,gtkstyle=,png=,xcb?] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=559802dfb2e6198e26fac1c4e9085a67
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.5.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.5.1
index 4fdb34640c1f..b06718507279 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtgui-5.5.1[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=801adb7b6d24ae494192168e304a27d9
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.5.1 b/metadata/md5-cache/dev-qt/qtxml-5.5.1
index 41633c8d1877..d2c27ff4701a 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.5.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.5.1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=d78ebf327d68aad64d421d2b80914b47
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1
index fcae76057ff6..b4ddca513793 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.5.1 ~dev-qt/qtnetwork-5.5.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	13e97f66a6815172991fe3e176f5e583	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+SRC_URI=https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	qt5-build	abd141247f04f3928a04a78554558f65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=c61b1de54f3dcdebdb8548fbd715ca5c
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.1 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
new file mode 100644
index 000000000000..767b9b176260
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Faster string escaping routines for your ruby apps
+EAPI=5
+HOMEPAGE=https://github.com/brianmario/escape_utils
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/escape_utils-1.2.1.gem
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d7720fba87720b8034aa50a65fe0481a
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.2.4 b/metadata/md5-cache/dev-ruby/jmespath-1.2.4
new file mode 100644
index 000000000000..5f8158faa05e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Implements JMESPath for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/jmespath/jmespath.rb
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=1
+SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.2.4.tar.gz -> jmespath-1.2.4.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b8e20a960c239314d68c39e812ebb3c9
diff --git a/metadata/md5-cache/dev-ruby/png-1.2.0-r2 b/metadata/md5-cache/dev-ruby/png-1.2.0-r2
deleted file mode 100644
index c2c1a7b6d73b..000000000000
--- a/metadata/md5-cache/dev-ruby/png-1.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=An almost pure-Ruby Portable Network Graphics (PNG) library
-EAPI=5
-HOMEPAGE=http://rubyforge.org/projects/seattlerb/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/png-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c70d8edf6eca1e4db2007e5dd68f2f85
diff --git a/metadata/md5-cache/dev-ruby/png-1.2.1 b/metadata/md5-cache/dev-ruby/png-1.2.1
index 7cf45ae2e975..7573ecf480c0 100644
--- a/metadata/md5-cache/dev-ruby/png-1.2.1
+++ b/metadata/md5-cache/dev-ruby/png-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] ) test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] ) test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] ) test? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=An almost pure-Ruby Portable Network Graphics (PNG) library
 EAPI=5
 HOMEPAGE=http://docs.seattlerb.org/png/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/png-1.2.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8cd2bbd9ffa0fe717a69a2c0eb2a333c
+_md5_=70338c6aa3c380531a0d74f32ea40d0e
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
index 5217b3de7666..88159c0e37c5 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=W3C HTML Tidy library implemented as a Ruby extension
 EAPI=5
 HOMEPAGE=https://github.com/carld/tidy
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=HTML-Tidy
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4971a5ec9f509464cce82cc9c596f33e
+_md5_=dbcb189ea921b0f93cce0e44add43424
diff --git a/metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.597.3_pre b/metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.597.3
similarity index 91%
rename from metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.597.3_pre
rename to metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.597.3
index 9b410dd4de2b..a7f6a295f45c 100644
--- a/metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.597.3_pre
+++ b/metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.597.3
@@ -4,9 +4,10 @@ DESCRIPTION=A complete toolset for web, mobile and enterprise development
 EAPI=5
 HOMEPAGE=https://www.jetbrains.com/idea
 IUSE=-custom-jdk
+KEYWORDS=~amd64 ~x86
 LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 RDEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15 >=virtual/jdk-1.7:*
 SLOT=0
 SRC_URI=https://download.jetbrains.com/idea/ideaIU-2016.1.1.tar.gz -> ideaIU-145.597.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e82fbadce4b8dd7eaf03ebab1d84e029
+_md5_=f01c6c2168de6d9077f3418596fec6e9
diff --git a/metadata/md5-cache/dev-util/idea-ultimate-2016.1.0.145.258.11 b/metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.844.1_pre
similarity index 79%
rename from metadata/md5-cache/dev-util/idea-ultimate-2016.1.0.145.258.11
rename to metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.844.1_pre
index 9ba766fb17dd..e8ad06c86e72 100644
--- a/metadata/md5-cache/dev-util/idea-ultimate-2016.1.0.145.258.11
+++ b/metadata/md5-cache/dev-util/idea-ultimate-2016.1.1.145.844.1_pre
@@ -4,10 +4,9 @@ DESCRIPTION=A complete toolset for web, mobile and enterprise development
 EAPI=5
 HOMEPAGE=https://www.jetbrains.com/idea
 IUSE=-custom-jdk
-KEYWORDS=~amd64 ~x86
 LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 RDEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15 >=virtual/jdk-1.7:*
 SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIU-2016.1.0.tar.gz -> ideaIU-145.258.11.tar.gz
+SRC_URI=https://download.jetbrains.com/idea/ideaIU-145.844.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a10936a6dc3f4eb8db1f03ab591219e3
+_md5_=f01c6c2168de6d9077f3418596fec6e9
diff --git a/metadata/md5-cache/dev-util/radare2-0.10.0 b/metadata/md5-cache/dev-util/radare2-0.10.2
similarity index 89%
rename from metadata/md5-cache/dev-util/radare2-0.10.0
rename to metadata/md5-cache/dev-util/radare2-0.10.2
index 8ce47def3573..12dca80883fd 100644
--- a/metadata/md5-cache/dev-util/radare2-0.10.0
+++ b/metadata/md5-cache/dev-util/radare2-0.10.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:= )
 SLOT=0
-SRC_URI=http://www.radare.org/get/radare2-0.10.0.tar.xz
+SRC_URI=http://www.radare.org/get/radare2-0.10.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
 _md5_=e209cbab263d118eb57b4ce09c091e2c
diff --git a/metadata/md5-cache/dev-util/radare2-0.9.8 b/metadata/md5-cache/dev-util/radare2-0.9.8
deleted file mode 100644
index b3d1e074e03e..000000000000
--- a/metadata/md5-cache/dev-util/radare2-0.9.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=ssl? ( dev-libs/openssl:= ) virtual/pkgconfig
-DESCRIPTION=Advanced command line hexadecimal editor and more
-EAPI=5
-HOMEPAGE=http://www.radare.org
-IUSE=debug ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.radare.org/get/radare2-0.9.8.tar.xz
-_md5_=fa25caca8b6c7d2da6d441ed3eefec79
diff --git a/metadata/md5-cache/dev-util/radare2-0.9.9 b/metadata/md5-cache/dev-util/radare2-0.9.9
deleted file mode 100644
index 2f1d7f7e98b8..000000000000
--- a/metadata/md5-cache/dev-util/radare2-0.9.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=ssl? ( dev-libs/openssl:= ) virtual/pkgconfig
-DESCRIPTION=Advanced command line hexadecimal editor and more
-EAPI=5
-HOMEPAGE=http://www.radare.org
-IUSE=debug ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.radare.org/get/radare2-0.9.9.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=5beae75f4ad9664f28be7af91cf0a1d5
diff --git a/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3 b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3
new file mode 100644
index 000000000000..5ff909da04f4
--- /dev/null
+++ b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-libs/libxml2 !dedicated? ( media-libs/libpng:0 media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl media-libs/libsdl[X,opengl,video] sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer ) ) >=sys-apps/sed-4
+DESCRIPTION=Fast-paced 3D lightcycle game based on Tron
+EAPI=5
+HOMEPAGE=http://armagetronad.org/
+IUSE=dedicated sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libxml2 !dedicated? ( media-libs/libpng:0 media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl media-libs/libsdl[X,opengl,video] sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer ) ) games-misc/games-envd
+SLOT=0
+SRC_URI=https://launchpad.net/armagetronad/0.2.8/0.2.8.3.x/+download/armagetronad-0.2.8.3.3.src.tar.bz2
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=1ebeb05ba7b4cfea9c3d7665262a4281
diff --git a/metadata/md5-cache/games-emulation/stella-4.7.2 b/metadata/md5-cache/games-emulation/stella-4.7.2
new file mode 100644
index 000000000000..4a30fbcb0a4a
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/stella-4.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0 sys-libs/zlib >=sys-apps/sed-4
+DESCRIPTION=Stella Atari 2600 VCS Emulator
+EAPI=5
+HOMEPAGE=http://stella.sourceforge.net/
+IUSE=joystick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ BSD
+RDEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0 sys-libs/zlib games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/stella/stella-4.7.2-src.tar.xz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=ea3176b0b84a55fa2eecaf1473b25f5c
diff --git a/metadata/md5-cache/media-sound/drumstick-1.0.2 b/metadata/md5-cache/media-sound/drumstick-1.0.2
index 00de23f043b2..271a55329a99 100644
--- a/metadata/md5-cache/media-sound/drumstick-1.0.2
+++ b/metadata/md5-cache/media-sound/drumstick-1.0.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/pkgconfig x11-misc/shared-mime-info doc? ( app-doc/doxygen app-text/docbook-xsl-stylesheets dev-libs/libxslt ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
-DESCRIPTION=Qt4/C++ wrapper for ALSA sequencer
-EAPI=5
+DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
+EAPI=6
 HOMEPAGE=http://drumstick.sourceforge.net/
 IUSE=doc
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-1.0.2.tar.bz2
 _eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3733e9f947dbe4bd27e8024b4371b309
+_md5_=aa149a6f31225860d259e92392a9e8f2
diff --git a/metadata/md5-cache/net-fs/samba-4.2.11 b/metadata/md5-cache/net-fs/samba-4.2.11
new file mode 100644
index 000000000000..7fa517b101a0
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.2.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/socket_wrapper-1.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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,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/libcap >=sys-libs/ldb-1.1.24[abi_x86_32(-)?,abi_x86_64(-)?,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/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/nss_wrapper-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.6[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.25[abi_x86_32(-)?,abi_x86_64(-)?,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/uid_wrapper-1.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) 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(-)?] ) pam? ( virtual/pam ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=5
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind python_targets_python2_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
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/socket_wrapper-1.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(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,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/libcap >=sys-libs/ldb-1.1.24[abi_x86_32(-)?,abi_x86_64(-)?,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/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/nss_wrapper-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ntdb-1.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.6[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.25[abi_x86_32(-)?,abi_x86_64(-)?,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/uid_wrapper-1.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) 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(-)?] ) pam? ( virtual/pam ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
+REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.2.11.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.2.9.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce
+_md5_=8d21dcdbc7aee52a0fc4dd77034356da
diff --git a/metadata/md5-cache/net-fs/samba-4.3.6 b/metadata/md5-cache/net-fs/samba-4.3.8
similarity index 99%
rename from metadata/md5-cache/net-fs/samba-4.3.6
rename to metadata/md5-cache/net-fs/samba-4.3.8
index 61362d734f5a..1615f543d07c 100644
--- a/metadata/md5-cache/net-fs/samba-4.3.6
+++ b/metadata/md5-cache/net-fs/samba-4.3.8
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,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/libcap >=sys-libs/ldb-1.1.24[abi_x86_32(-)?,abi_x86_64(-)?,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/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.3[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.7[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.25[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) 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(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
 REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) python_targets_python2_7
 SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.3.6.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.3.6.tar.xz
+SRC_URI=mirror://samba/stable/samba-4.3.8.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.3.6.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce
 _md5_=baf282c9ba330aef66d23c12b9fc28e4
diff --git a/metadata/md5-cache/net-fs/samba-4.4.0 b/metadata/md5-cache/net-fs/samba-4.4.2
similarity index 99%
rename from metadata/md5-cache/net-fs/samba-4.4.0
rename to metadata/md5-cache/net-fs/samba-4.4.2
index 368c62371029..69014969cbd6 100644
--- a/metadata/md5-cache/net-fs/samba-4.4.0
+++ b/metadata/md5-cache/net-fs/samba-4.4.2
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,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/libcap >=sys-libs/ldb-1.1.26[abi_x86_32(-)?,abi_x86_64(-)?,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/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.6[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.28[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) 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(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
 REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) python_targets_python2_7
 SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.4.0.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.4.0_rc5.tar.xz
+SRC_URI=mirror://samba/stable/samba-4.4.2.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.4.0_rc5.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce
 _md5_=34dd0799944e074e2f3128fbe4539f3d
diff --git a/metadata/md5-cache/net-misc/miniupnpd-1.10_pre20160222 b/metadata/md5-cache/net-misc/miniupnpd-1.10_pre20160222
new file mode 100644
index 000000000000..ac954e897b1b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-1.10_pre20160222
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0= sys-apps/lsb-release
+DESCRIPTION=MiniUPnP IGD Daemon
+EAPI=6
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0=
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-1.9.20160222.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=65f88fdef62c02a365a6384a310246d5
diff --git a/metadata/md5-cache/sys-cluster/neutron-2016.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2016.1.9999
index b9c1494575a9..5b709e7d9605 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2016.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2016.1.9999
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7 python_targets_python3_4
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/routes-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !=dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/neutron-lib-0.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-neutronclient-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ryu-3.30[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ovs-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/iproute2 net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables openvswitch? ( <=net-misc/openvswitch-2.5.9999 ) ipv6? ( net-misc/radvd ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/routes-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !=dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/neutron-lib-0.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-neutronclient-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ryu-3.30[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ovs-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/iproute2 net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools openvswitch? ( <=net-misc/openvswitch-2.5.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/configs.tar.gz -> neutron-configs-2016.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/ml2_plugins.tar.gz -> neutron-ml2-plugins-2016.1.9999.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=92148f25ad61f5d5954349cd3e258c50
+_md5_=07929a8301becdcacb7b4bbc86953858
diff --git a/metadata/md5-cache/sys-cluster/neutron-8.0.0 b/metadata/md5-cache/sys-cluster/neutron-8.0.0
index b1ca36d66d33..19e134d3fde2 100644
--- a/metadata/md5-cache/sys-cluster/neutron-8.0.0
+++ b/metadata/md5-cache/sys-cluster/neutron-8.0.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7 python_targets_python3_4
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/routes-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !=dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/neutron-lib-0.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-neutronclient-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ryu-3.30[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ovs-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/iproute2 net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables openvswitch? ( <=net-misc/openvswitch-2.5.9999 ) ipv6? ( net-misc/radvd ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/routes-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !=dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/neutron-lib-0.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-neutronclient-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ryu-3.30[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ovs-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-apps/iproute2 net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools openvswitch? ( <=net-misc/openvswitch-2.5.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/neutron/neutron-8.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/configs.tar.gz -> neutron-configs-8.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/ml2_plugins.tar.gz -> neutron-ml2-plugins-8.0.0.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d0d80fd2991fb25908d7fbb95c80afa
+_md5_=509cdf99553ccb418f2818de63b8b637
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.7
new file mode 100644
index 000000000000..62d9b78b39ac
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build kdbus
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-9.base.tar.xz mirror://gentoo/genpatches-4.4-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-9.experimental.tar.xz )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=10baed0bd5e5dcf05d71e3350988f27c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.5.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.5.1
new file mode 100644
index 000000000000..7ab04fef876f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.5 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build kdbus
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.5.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz mirror://gentoo/genpatches-4.5-3.base.tar.xz mirror://gentoo/genpatches-4.5-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.5-3.experimental.tar.xz )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=68b82bfa4f113fc16dc8ac594f34a72f
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.9 b/metadata/md5-cache/sys-libs/tdb-1.3.9
new file mode 100644
index 000000000000..87e18d291fe1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/docbook-xml-dtd:4.2
+DESCRIPTION=A simple database API
+EAPI=6
+HOMEPAGE=http://tdb.samba.org/
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.9.tar.gz
+_eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	waf-utils	c21174962af5ca8091b66f58612797ce
+_md5_=05c59c03debf10744b92e14aeefe3080
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15
index c12ab978fcf7..0031ce5bc40c 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15
@@ -5,8 +5,9 @@ HOMEPAGE=http://www.uclibc.org/
 IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only savedconfig
 KEYWORDS=-* amd64 arm m68k ~mips ppc sh sparc x86
 LICENSE=LGPL-2
+RDEPEND=!sys-libs/uclibc-ng
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://uclibc.org/downloads/uClibc-0.9.33.2.tar.bz2 mirror://gentoo/uClibc-0.9.33.2-patches-17.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=2b638cf02efdf1ac3373539137e99fe3
+_md5_=f830cec18929676d31d18c6a70b6b609
diff --git a/metadata/md5-cache/sys-libs/uclibc-0.9.33.9999 b/metadata/md5-cache/sys-libs/uclibc-0.9.33.9999
index e6bf28b83911..428206b4beb4 100644
--- a/metadata/md5-cache/sys-libs/uclibc-0.9.33.9999
+++ b/metadata/md5-cache/sys-libs/uclibc-0.9.33.9999
@@ -5,7 +5,8 @@ EAPI=0
 HOMEPAGE=http://www.uclibc.org/
 IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only savedconfig
 LICENSE=LGPL-2
+RDEPEND=!sys-libs/uclibc-ng
 RESTRICT=strip
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-2	df00117322129fb906bb0a53c3d6a020	multilib	3972ca401cf7dbb430df9995f5d8d580	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=0a212c0791bdad27742616463e0bae33
+_md5_=45866eba258c08aefc6c5c60808d9b5c
diff --git a/metadata/md5-cache/sys-libs/uclibc-9999 b/metadata/md5-cache/sys-libs/uclibc-9999
index 92eec7571ea8..178b12beacdd 100644
--- a/metadata/md5-cache/sys-libs/uclibc-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-9999
@@ -5,7 +5,8 @@ EAPI=0
 HOMEPAGE=http://www.uclibc.org/
 IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only savedconfig
 LICENSE=LGPL-2
+RDEPEND=!sys-libs/uclibc-ng
 RESTRICT=strip
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-2	df00117322129fb906bb0a53c3d6a020	multilib	3972ca401cf7dbb430df9995f5d8d580	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=a40b96c29a37c6ceaf68b7541b1b1a7c
+_md5_=654fe77f95054b93686bf128893499f6
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.13 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.13
new file mode 100644
index 000000000000..c0e5d56cec2b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=C library for developing embedded Linux systems
+EAPI=6
+HOMEPAGE=http://www.uclibc.org/
+IUSE=debug hardened iconv ipv6 rpc crosscompile_opts_headers-only savedconfig
+KEYWORDS=-* ~amd64 ~arm ~mips ~ppc ~x86
+LICENSE=LGPL-2
+RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://downloads.uclibc-ng.org/releases/1.0.13/uClibc-ng-1.0.13.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ad9268e226da6cba44f4971b86347f7a
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-9999 b/metadata/md5-cache/sys-libs/uclibc-ng-9999
new file mode 100644
index 000000000000..937920e2d7ae
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
+DESCRIPTION=C library for developing embedded Linux systems
+EAPI=6
+HOMEPAGE=http://www.uclibc.org/
+IUSE=debug hardened iconv ipv6 rpc crosscompile_opts_headers-only savedconfig
+LICENSE=LGPL-2
+RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
+RESTRICT=strip
+SLOT=0
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	multilib	3972ca401cf7dbb430df9995f5d8d580	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ad9268e226da6cba44f4971b86347f7a
diff --git a/metadata/md5-cache/virtual/libc-0 b/metadata/md5-cache/virtual/libc-0
index 627fce4b5144..e08e0f01ebfe 100644
--- a/metadata/md5-cache/virtual/libc-0
+++ b/metadata/md5-cache/virtual/libc-0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the C library
 EAPI=5
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=!prefix? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc ) elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) )
+RDEPEND=!prefix? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( || ( sys-libs/uclibc sys-libs/uclibc-ng ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) )
 SLOT=0
-_md5_=faa5dbaae331d6000ade2bc4aa4bedb6
+_md5_=a8cc3b68afb84090ba9afc9562479423
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-51.0.2700.0_p1 b/metadata/md5-cache/www-client/google-chrome-unstable-51.0.2704.4
similarity index 95%
rename from metadata/md5-cache/www-client/google-chrome-unstable-51.0.2700.0_p1
rename to metadata/md5-cache/www-client/google-chrome-unstable-51.0.2704.4
index 47b7757061e9..d66d7f60c4de 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-51.0.2700.0_p1
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-51.0.2704.4
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates 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:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 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/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_51.0.2700.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_51.0.2704.4-1_amd64.deb
 _eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=af26ebc1c63b8de79093995f493c5215
+_md5_=66027716b1367ea63392289f36a03d92
diff --git a/metadata/md5-cache/www-client/opera-36.0.2130.32 b/metadata/md5-cache/www-client/opera-36.0.2130.65
similarity index 97%
rename from metadata/md5-cache/www-client/opera-36.0.2130.32
rename to metadata/md5-cache/www-client/opera-36.0.2130.65
index 144481aee2a8..bc276c41f378 100644
--- a/metadata/md5-cache/www-client/opera-36.0.2130.32
+++ b/metadata/md5-cache/www-client/opera-36.0.2130.65
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 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/desktop/36.0.2130.32/linux/opera-stable_36.0.2130.32_amd64.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera/desktop/36.0.2130.65/linux/opera-stable_36.0.2130.65_amd64.deb )
 _eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=8715651ba02c469733b6416bbbfa3948
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-51.0.2700.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-51.0.2704.4_alpha
similarity index 90%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-51.0.2700.0_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-51.0.2704.4_alpha
index df99e025d59c..1c86715fd935 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-51.0.2700.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-51.0.2704.4_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_51.0.2700.0-1_amd64.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_51.0.2704.4-1_amd64.deb )
 _eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be
 _md5_=9ce556e3f9426ad0d4ebc12933fbead0
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 20081ef9741a..4dc998984213 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Apr 2016 19:39:41 +0000
+Wed, 13 Apr 2016 05:09:26 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5f92d1a4ef9d..ea1e0b699b44 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Apr 12 19:38:49 UTC 2016
+Wed Apr 13 05:08:36 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 75fc423b4c90..6a4037d243f8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Apr 2016 20:00:01 +0000
+Wed, 13 Apr 2016 05:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c13e28f3620a..4fe4623f1350 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1460490001 Tue 12 Apr 2016 07:40:01 PM UTC
+1460524201 Wed 13 Apr 2016 05:10:01 AM UTC
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 213bd4396738..77e19ddba463 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,9 +1,10 @@
 DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
 DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
 DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
+DIST samba-4.2.11.tar.gz 20875348 SHA256 75bce53c922e51352933c9846f2c4b1e251fabb80927adb426a773a321ee01f8 SHA512 293365f2718e756b66ccaec4b0dbce7044ade615b332f58968cf42dd1ec6b6445576590eaf5bd35fa00ba9aa4ba3be7720afc33763652e97731eebc3149f4820 WHIRLPOOL 1e04fd527e55c8d438c96a43d9a25a9b3e09a3edc504a2a5fe44bc8f9101c833c90e3ba3188b8872b046370916f3798e4fce0ffa7848b65f452b5c51ec7107f1
 DIST samba-4.2.9.tar.gz 20750339 SHA256 ba0229485e8bebac22bd3ae98b1e393e7127f3a958cc90e205a6d752e575354c SHA512 438196f268c0ca0b83e8e7e9eb8e9a8b503d6408d5e2b0dca1d041185e06cfc08147122d5495b72c46ce58dc3cb4be4766551f0101c69b2620b89e749d89ad98 WHIRLPOOL aa7a655a3d2f2bf81d2747d83c86a0c7d464a31414b6e27a413461e1e0ad0ce3d3af5d756d8ce213e775f5141c44ef9c41a792e88d246bcab002b7623552260a
-DIST samba-4.3.6.tar.gz 20445038 SHA256 3251eca5b196854e79978f4a92d5fd2b55bd7b0a252a65131a9be02be6754924 SHA512 2551ece4e17ed855c8faf488e4438229455a063ba7687fd36bf650d72676bab3bef7e2bc9de05a00081285268bf527b9c781024ea31aac493d2fcd5fd2593c21 WHIRLPOOL c1b375323cd925f76d8664d5ec6fc4ee5d0cad415d010e33fb485e178229feccd21ed49f175b69d15655a627f12cdb59c3c0f026ed2c6323c8ce8569ceb984ea
-DIST samba-4.4.0.tar.gz 20590101 SHA256 c5f6fefb7fd0a4e5f404a253b19b55f74f88faa1c3612cb3329e24aa03470075 SHA512 a8bc60c5640b7cd06d7e93a222ac7b3f6fb7396849cd70051f9e65d5b2b84136c7f3fb5aa742c1d70efb3ba81275dc51efb91980ff9dc337cfe7247c849497f4 WHIRLPOOL 401367927e8081898aa4901a72c18a4858cc6e3626cc5123c5c71ab727248a85b703bdda67b4cb89aef2a2e5d7d738157cced72d60e4ac2dfd74979111ece28b
+DIST samba-4.3.8.tar.gz 20568773 SHA256 379dc66c3a0a483bf5bed37be6e5d182934db7c4102b21929a6c4602b32b2b10 SHA512 cb88b19733da2aad7c6843d31e5f017ac83e7021a4bf96e193661eec8d29be32512e04d0d427bea326c1ea955c120553e78bddca24bd354129ab65502c8afe43 WHIRLPOOL 5e8664e32d4cb5787d19729dc10208ef5ad0fa8ca8248a2e673a25271294d8c941a48cd680e369ec0fb4d07c3bcb4c6899c9f85614068c2721266fa140353df8
+DIST samba-4.4.2.tar.gz 20711230 SHA256 eaecd41a85ebb9507b8db9856ada2a949376e9d53cf75664b5493658f6e5926a SHA512 ba965ee32d9cfd9c54ef523fc2ed4179000de956a563fdd91625d2bbcf6f07dd787c8b7e3dc4c824f46c87eea0aa97e7123d759992080fdfb2fde8554d18e3b7 WHIRLPOOL a4a51e8af98902bfed109fc126ad53c9222b498d947555bfe1223ae4dee5ea951561d8a4392e15221cf6010b2385df23688915b348852dbdc538dc84942a6b1d
 DIST samba-disable-python-patches-4.2.9.tar.xz 6016 SHA256 222d0153f03dddde28a0b906ee2b27076223ac88b84a998aaa285f658861edfa SHA512 02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18 WHIRLPOOL ebba3a6d41a41844621759672aa8c984d26f44d12007c8e929405470c381bc262523ec68d3972e86cf675c45f092fa287496167e42940e70d704790753e47b03
 DIST samba-disable-python-patches-4.3.6.tar.xz 6076 SHA256 95f9194abcba917aa5e2e9623e897eb41127a8c74352ebf6a9bf0f4ba82fd1c0 SHA512 601026aae1fd960e3f4cf53c0f68e843a118f6dd4fc776d9a6503fd16f9789e743eb92b7ebf84179d63aaff20d1ddb1989cb995fc1da3cd2e843f6830f04f08f WHIRLPOOL 5afb076857f049469e65a13eb46af98f21b249d9c7ef9d731bd6f3aeb6e9512efc781b5392c0c7aaeb7a818e9e896f336a70b306122280d3ad432372bc6b0024
 DIST samba-disable-python-patches-4.4.0_rc5.tar.xz 6048 SHA256 96d302ff55a36d2992a05c7437068b2e9182460227b4cddedff7adbf1b350966 SHA512 9a330d52cb0888854ec614650a6d22b5f541d5eb10734b1bdf977a7de9e327227a01c86cff9c5097e6684da7350b27a0f775c3cbe6ab393a3ae40c9a0e6ed113 WHIRLPOOL 94ac3b6c6f3b8fc2523e9f6aa9744f50072adcfb4c81aea8cfcf7c1ca2ec8c6f4c09af89953a1968d8fda91c96cf22a87702b62439c3f749f614dc5fec3b538c
diff --git a/net-fs/samba/samba-4.2.11.ebuild b/net-fs/samba/samba-4.2.11.ebuild
new file mode 100644
index 000000000000..51fcc3322143
--- /dev/null
+++ b/net-fs/samba/samba-4.2.11.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.2.9.tar.xz"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS="~hppa"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.24[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/nss_wrapper-1.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.25[${MULTILIB_USEDEP}]
+	>=sys-libs/uid_wrapper-1.0.1[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( virtual/pam )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
+	"${FILESDIR}/${PN}-4.2.7-pam.patch"
+)
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use aio ; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+			ewarn "You must enable AIO support in your kernel config, "
+			ewarn "to be able to support asynchronous I/O. "
+			ewarn "You can find it at"
+			ewarn
+			ewarn "General Support"
+			ewarn " Enable AIO support "
+			ewarn
+			ewarn "and recompile your kernel..."
+		fi
+	fi
+	if use cluster ; then
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+	fi
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	# install the patches from tarball(s)
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	# Allow user patches
+	epatch_user
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--with-modulesdir=/usr/$(get_libdir)/samba
+		--with-piddir=/var/run/${PN}
+		--bundled-libraries=NONE
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(use_with acl acl-support)
+			$(usex addc '' '--without-ad-dc')
+			$(use_with addns dnsupdate)
+			$(use_with ads)
+			$(usex ads '--with-shared-modules=idmap_ad' '')
+			$(use_with aio aio-support)
+			$(use_enable avahi)
+			$(use_with cluster cluster-support)
+			$(use_enable cups)
+			$(use_with dmapi)
+			$(use_with fam)
+			$(use_enable gnutls)
+			$(use_enable iprint)
+			$(use_with ldap)
+			$(use_with pam)
+			$(use_with pam pam_smbpass)
+			$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
+			$(use_with quota quotas)
+			$(use_with syslog)
+			$(use_with systemd)
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			$(use_with winbind)
+			$(usex test '--enable-selftest' '')
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--without-aio-support
+			--disable-avahi
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--disable-iprint
+			$(use_with ldap)
+			--without-pam
+			--without-pam_smbpass
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.3.6.ebuild b/net-fs/samba/samba-4.3.8.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.3.6.ebuild
rename to net-fs/samba/samba-4.3.8.ebuild
diff --git a/net-fs/samba/samba-4.4.0.ebuild b/net-fs/samba/samba-4.4.2.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.4.0.ebuild
rename to net-fs/samba/samba-4.4.2.ebuild
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 9915e8c9e3bb..521d04996f00 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1 +1,2 @@
 DIST miniupnpd-1.9.20150721.tar.gz 207562 SHA256 9340224e5023ecb5d1b7f45e4d69734dcfbadbe41a80d1f0182347e6b8104470 SHA512 ed060a19bfb8f285c10d0c86ca54b646d8cad6baf29266bb395fe75ec23de63986a51362281213e9a14cd14225cc19a33cf404a139a55c7b0f72ced78581c660 WHIRLPOOL 9050b20f6118c63fe9d1cce8c8710e47e9e491ff28a1df29bf4b7a1e4e57fa537b06ce8ed667c1bc138e63dc23ba95a793980a32586c84a4728aa5977d10c6d4
+DIST miniupnpd-1.9.20160222.tar.gz 217541 SHA256 e7d9d071876ac2ed41a04fe4436f8a8d4329c5c31d940e98c6666ca26823c960 SHA512 ebc24a69fde793a537c46bc1e2107f94a17b0d8818aa23a4b6faeb2b735f35db840a6ccc49efbe62a3960ad1f346bbb183b6d06eb5ac42c98c2d56c02869fdda WHIRLPOOL 12ef3a7861b2238cd806836a972438c2b60c9f2558aee2a36eb8f6dbea149dc289447697d55b11147c20cee9fde5f1bc7fbd13e86190b82a47d7d2242482774b
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.10_pre20160222-build.patch b/net-misc/miniupnpd/files/miniupnpd-1.10_pre20160222-build.patch
new file mode 100644
index 000000000000..3323b1cfd86f
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-1.10_pre20160222-build.patch
@@ -0,0 +1,125 @@
+diff --git a/Makefile.linux b/Makefile.linux
+index ce6b994..e535c38 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -36,6 +36,7 @@ INSTALL = install
+ STRIP ?= strip
+ PKG_CONFIG ?= pkg-config
+ CP = cp
++LDLIBS_IPV6 :=
+ 
+ 
+ INSTALLPREFIX ?= $(PREFIX)/usr
+@@ -55,90 +56,8 @@ NETFILTEROBJS = netfilter/iptcrdr.o netfilter/iptpinhole.o netfilter/nfct_get.o
+ 
+ ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
+ 
+-PCFILE_FOUND := $(shell $(PKG_CONFIG) --exists libiptc; echo $$?)
+-
+-ifeq (${PCFILE_FOUND},0)
+-
+-IPTABLESVERSION := $(shell $(PKG_CONFIG) --modversion libiptc)
+-IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )
+-IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )
+-IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
+-# test if iptables version >= 1.4.3
+-TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
+-ifeq ($(TEST), 1)
++LDLIBS += -lip4tc $(LDLIBS_IPV6)
+ CPPFLAGS += -DIPTABLES_143
+-endif
+-
+-CFLAGS  += $(shell $(PKG_CONFIG) --cflags libiptc)
+-LDLIBS  += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc)
+-LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc)
+-LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc)
+-else
+-
+-ifeq "$(wildcard /etc/gentoo-release )" ""
+-LDLIBS ?= -liptc
+-else # gentoo
+-# the following is better, at least on gentoo with iptables 1.4.6
+-# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618
+-# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183
+-LDLIBS ?= -lip4tc
+-CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS)
+-endif
+-
+-ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64)
+-ifdef IPTABLESPATH
+-CPPFLAGS := $(CPPFLAGS) -I$(IPTABLESPATH)/include/
+-LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/
+-# get iptables version and set IPTABLES_143 macro if needed
+-ifeq ($(TARGET_OPENWRT),)
+-IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h | tr -d \" |cut -d" " -f3 )
+-IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 )
+-IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 )
+-IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 )
+-# test if iptables version >= 1.4.3
+-TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 )
+-ifeq ($(TEST), 1)
+-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
+-# the following sucks, but works
+-LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
+-#LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
+-else # ifeq ($(TEST), 1)
+-LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a
+-endif # ifeq ($(TEST), 1)
+-else # ($(TARGET_OPENWRT),)
+-# openWRT :
+-# check for system-wide iptables files. Test if iptables version >= 1.4.3
+-# the following test has to be verified :
+-TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1)
+-ifeq ($(TEST), 1)
+-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
+-LDLIBS = -liptc
+-endif  # ($(TEST), 1)
+-TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1)
+-ifeq ($(TEST_LIB), 1)
+-LDLIBS = -liptc /usr/lib$(ARCH)/libiptc.a
+-endif # ($(TEST_LIB), 1)
+-endif # ($(TARGET_OPENWRT),)
+-else # ifdef IPTABLESPATH
+-# IPTABLESPATH not defined
+-# the following test has to be verified :
+-TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1)
+-ifeq ($(TEST), 1)
+-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
+-LDLIBS = -liptc
+-TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1)
+-ifeq ($(TESTIP4TC), 1)
+-LDLIBS := $(LDLIBS) -lip4tc
+-endif # ($(TESTIP4TC), 1)
+-TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1)
+-ifeq ($(TESTIP6TC), 1)
+-LDLIBS := $(LDLIBS) -lip6tc
+-endif # ($(TESTIP6TC), 1)
+-endif # ($(TEST), 1)
+-endif # ifdef IPTABLESPATH
+-endif # ifdef PCFILE_FOUND
+-
+-#LDLIBS += -lnfnetlink
+ 
+ TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack && $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1)
+ ifeq ($(TEST),1)
+@@ -194,7 +113,6 @@ install:	miniupnpd miniupnpd.8 miniupnpd.conf genuuid \
+ 	$(INSTALL) linux/miniupnpd.init.d.script $(DESTDIR)$(PREFIX)/etc/init.d/miniupnpd
+ 	$(INSTALL) -d $(DESTDIR)$(MANINSTALLDIR)
+ 	$(INSTALL) --mode=0644 miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR)
+-	gzip -f $(DESTDIR)$(MANINSTALLDIR)/miniupnpd.8
+ 
+ # genuuid is using the uuidgen CLI tool which is part of libuuid
+ # from the e2fsprogs
+diff --git a/genconfig.sh b/genconfig.sh
+index 976e963..faef028 100755
+--- a/genconfig.sh
++++ b/genconfig.sh
+@@ -299,7 +299,7 @@ case $OS_NAME in
+ 		fi
+ 		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
+ 		FW=netfilter
+-		V6SOCKETS_ARE_V6ONLY=`/sbin/sysctl -n net.ipv6.bindv6only`
++		V6SOCKETS_ARE_V6ONLY=`/usr/sbin/sysctl -n net.ipv6.bindv6only`
+ 		;;
+ 	OpenWRT)
+ 		OS_URL=http://www.openwrt.org/
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r1 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
new file mode 100644
index 000000000000..1464bf04bd18
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r1
@@ -0,0 +1,10 @@
+# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script
+
+# extra arguments to be passed to the command
+#extra_args=""
+
+# the location of the configuration file
+#config_file="/etc/miniupnpd/miniupnpd.conf"
+
+# uncomment to not use included scripts to manipulate iptables
+#no_iptables_scripts=1
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r1 b/net-misc/miniupnpd/files/miniupnpd-init.d-r1
new file mode 100644
index 000000000000..99406106a86d
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r1
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/miniupnpd"
+: "${config_file:=/etc/miniupnpd/miniupnpd.conf}"
+command_args="-f ${config_file:-/etc/miniupnpd/miniupnpd.conf} ${extra_args}"
+: "${pidfile:=/var/run/miniupnpd.pid}"
+
+depend() {
+	need net iptables
+	use minissdpd
+}
+
+start_pre() {
+	local retval=0
+
+	if [[ -z ${no_iptables_scripts} ]]; then
+		/etc/miniupnpd/iptables_init.sh || retval=${?}
+	fi
+	
+	return ${retval}
+}
+
+stop_post() {
+	local retval=0
+
+	if [[ -z ${no_iptables_scripts} ]]; then
+		/etc/miniupnpd/iptables_removeall.sh
+	fi
+
+	return ${retval}
+}
diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
index eaaaddf0d4d3..902c9408d39a 100644
--- a/net-misc/miniupnpd/metadata.xml
+++ b/net-misc/miniupnpd/metadata.xml
@@ -5,7 +5,18 @@
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 	<longdescription>
 		MiniUPnP Internet Gateway Device Deamon, used to allow UPnP enabled clients to forward ports.
 	</longdescription>
+  <use>
+    <flag name="leasefile">Enable lease file.</flag>
+    <flag name="igd2">Build for IGDv2 instead of an IGDv1</flag>
+    <flag name="pcp-peer">Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.</flag>
+    <flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag>
+    <flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-misc/miniupnpd/miniupnpd-1.10_pre20160222.ebuild b/net-misc/miniupnpd/miniupnpd-1.10_pre20160222.ebuild
new file mode 100644
index 000000000000..061fa32c24ec
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-1.10_pre20160222.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs versionator flag-o-matic
+
+MY_PV=$(get_version_component_range 3)
+MY_PV=1.9.${MY_PV#pre}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+	net-libs/libnfnetlink:=
+	net-libs/libmnl:=
+	dev-libs/gmp:0=
+	sys-apps/util-linux
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10_pre20160222-build.patch"
+)
+
+src_prepare() {
+	default
+	mv Makefile.linux Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(use igd2 && printf -- '--igd2\n')
+		$(use ipv6 && printf -- '--ipv6\n')
+		$(use leasefile && printf -- '--leasefile\n')
+		$(use portinuse && printf -- '--portinuse\n')
+		$(use pcp-peer && printf -- '--pcp-peer\n')
+		$(use strict && printf -- '--strict\n')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" \
+		STRIP=true \
+		LDLIBS_IPV6="$(use ipv6 && printf -- '-lip6tc')" \
+		miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index c27ecdf922fc..6ac82f21ab52 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Ian Delaney <idella4@gentoo.org> (13 Apr 2016)
+# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
+# media-libs/raspberrypi-userland isn't stable yet
+media-video/mpv raspberry-pi
+
 # Brian Evans <grknight@gentoo.org> (08 Jan 2016)
 # net-misc/libteam is not yet stable on arm
 net-misc/networkmanager teamd
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 949678608f05..b02234feec36 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6100,6 +6100,11 @@ net-misc/megatools:fuse - Enables support for the filesystem in userspace plugin
 net-misc/memcached:slabs-reassign - Allow manual reassignment of memory slabs at the cost of slab optimizations.
 net-misc/minidlna:netgear - Enable netgear branding
 net-misc/minidlna:readynas - Enable readynas branding
+net-misc/miniupnpd:igd2 - Build for IGDv2 instead of an IGDv1
+net-misc/miniupnpd:leasefile - Enable lease file.
+net-misc/miniupnpd:pcp-peer - Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.
+net-misc/miniupnpd:portinuse - Check if a port is in use before allowing a NAT-PMP client to map it.
+net-misc/miniupnpd:strict - Be more strict regarding compliance with UPnP specifications.
 net-misc/modemmanager:mbim - Enable MBIM modem protocol
 net-misc/modemmanager:qmi - Enable support for the QMI modem protocol used by devices with Qualcomm chipsets
 net-misc/modemmanager:qmi-newest - Avoid deprecated QMI commands. Warning: may cause incompatibility with older devices.
@@ -7707,6 +7712,7 @@ sys-libs/uclibc:savedconfig - Adds support for user defined configs
 sys-libs/uclibc:ssp - Force the use of ssp to be built into a hardened uclibc setup
 sys-libs/uclibc:uclibc-compat - Build uclibc with backwards compatible options
 sys-libs/uclibc:wordexp - Add support for word expansion (wordexp.h)
+sys-libs/uclibc-ng:rpc - Enable sun nis/rpc support (you should use libtirpc though)
 sys-libs/zlib:minizip - include the minizip library for quick and dirty zip extraction
 sys-power/cpupower:cpufreq_bench - Build and install the cpufreq_bench binary
 sys-power/nut:ipmi - Support IPMI-based UPSes.
diff --git a/sys-cluster/neutron/neutron-2016.1.9999.ebuild b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
index af4b94acbbcb..e0eda23d6bd2 100644
--- a/sys-cluster/neutron/neutron-2016.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
@@ -103,8 +103,12 @@ RDEPEND="
 	net-firewall/ipset
 	net-firewall/iptables
 	net-firewall/ebtables
+	net-firewall/conntrack-tools
 	openvswitch? ( <=net-misc/openvswitch-2.5.9999 )
-	ipv6? ( net-misc/radvd )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
 	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
 #PATCHES=(
diff --git a/sys-cluster/neutron/neutron-8.0.0.ebuild b/sys-cluster/neutron/neutron-8.0.0.ebuild
index d49546db2ca2..c15208b51130 100644
--- a/sys-cluster/neutron/neutron-8.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-8.0.0.ebuild
@@ -102,8 +102,12 @@ RDEPEND="
 	net-firewall/ipset
 	net-firewall/iptables
 	net-firewall/ebtables
+	net-firewall/conntrack-tools
 	openvswitch? ( <=net-misc/openvswitch-2.5.9999 )
-	ipv6? ( net-misc/radvd )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
 	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
 #PATCHES=(
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index f478befc6a2d..fb1e39cfba73 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -61,9 +61,15 @@ DIST genpatches-4.1-26.extras.tar.xz 16168 SHA256 462116699602f0115af98847c2394f
 DIST genpatches-4.4-8.base.tar.xz 243736 SHA256 70a54851283def9013601bd8ea299c04850410001e36d619fa6e83b64a4f0907 SHA512 fde00c28bc8da96aee2378d7ea36c85a5f8520c271e0251c7bc7472cd3c395dc2c3f5168f38b1bd10e6b5189bedc8b10780899468a368f8e9be1811bc31c0ab1 WHIRLPOOL 1190d8167c05062a53a7cc66a36310b42f6b90a711a497543b68626e1d6ca3fbc1c57a37dfa2a1fc98ed4f3b1dae5d7e77b74f3d708bc830b2bd5c31fc797b74
 DIST genpatches-4.4-8.experimental.tar.xz 62604 SHA256 35148c3d46a256819b5d214203b7365316694e85a729ddec2e5c229e48b9091d SHA512 e1e5b31d35a851f446645a2ac403ab238d63fb540e8443d36a30dd8a5d32016b077c4cfdcb30976e5facc511c0a6116037efb0af0a4840e00a1d8cf6be3fe310 WHIRLPOOL 4b65738d20969d5098feb66e416af450f0be87fa8c1770381165f70ca99e019400ff9e92c92d8f6dc1b641f4a400fa6165f0573aeb68ecba05f8934a348e6cc7
 DIST genpatches-4.4-8.extras.tar.xz 16284 SHA256 50b6dc7b842191a49a77d0f54302ebd1c7334e5f60cccc91e2a02db51ae074f8 SHA512 478e31f23742a99e4b3a2d24c93f0880c1794d40e5b05b80cc472ce237e14f28a83cb31554b686c8ec78e80b776fca363a1aabe450add7a3142ad30a4b586841 WHIRLPOOL 2ff0a37edadfd391b59bbe5158c463ee4b411fcd06e8f5bf53f58b19f88a564a40fabe690d5ac12f108e02d3a001d8b928372aa453f060d530ff2e30d0617113
+DIST genpatches-4.4-9.base.tar.xz 304360 SHA256 e9ba25000126256be414a273b154accc51ef523d236c35e2214ee75e243aa71f SHA512 ef239c362defeafc92eae84ede7a07820ddf0c01002f52a58d39d7b0dcdfd83af2d5fa4d2ee3d2c57e4c89a30d4fbf05dc5519886b8f55bf148ce4197b85d465 WHIRLPOOL 88963d0eac645d453ccf1cfe0e30777090240f18f20ccf735b7551a57365c2505849b13c8cd4092542f6baf6d251eb0e9c44fbba118d9677f9cd334e0ef10861
+DIST genpatches-4.4-9.experimental.tar.xz 62624 SHA256 2935109513db96450e9496d451d012b74ccbc231c8514f40711c60baa30f4fce SHA512 5a5658b7d43c2754b8ba9f804d979db2470d99c19b1da6d16d79c3105d7f522a7896886037afb3004b53c7fec4102c3528ac8ff419422af157813b6606d81205 WHIRLPOOL 42e26ba14777515ff6c1aa3dbf5b259ba4f4191afca56412af6bf1da2c9cf196a525481115f2cb9b8d929719868be0f7cc2735abd389dc4151153843119b71e9
+DIST genpatches-4.4-9.extras.tar.xz 16284 SHA256 720c66b1195b09a0ac5989f4b3e02a48e40fa9e4e8ca711f39880676c4b0ee2b SHA512 d9fd94f2524e269d1c134808799d6fcf790b9c33cd8db95f0e14be9f2e2701ec9392e87b37d25e67a18e59137a1448b779c1bb2c140d6d0efc384b0f738b8917 WHIRLPOOL fc258f467beac9c0ba2016bbc8c3145ab6ee549b0eac6750fef3474bf5abf5f5e9cb7eda156f4609f2fde1ae090f1353435873607de5448b70f84e26a74b4a7c
 DIST genpatches-4.5-2.base.tar.xz 3532 SHA256 d17b809cb0c598cf2e809d4d7946c6b5804832a0323ebb54616d4011469507f9 SHA512 3ba9d91360c2c9907a58b313cd375afc6e9f33984316348607c976dc4e7cd21add70439f8e5dfbc238c2289328b76504c5d027cf15ff407ec906868310842794 WHIRLPOOL ed1371ab4e6b72a7812356e5c1dc9860fe588f89e601a8cf17879e8343e06c917d2f210713da2d409d9bb5d1d9e0561b4f20367f1304e32d10176597f06fb2d5
 DIST genpatches-4.5-2.experimental.tar.xz 4896 SHA256 398a53e0f2678b2f5b0c95a33c9096234a89c249ff9948e8bf7a1be828c89ae8 SHA512 c7449d2595fb4928560ece33beaf8d61f3491679f2ac38e71fbed8b1b4b796f044d538654d2ac505df83d7dbd52527886c43e6adb192be7edaf5fd2b4eaf0e45 WHIRLPOOL 81c5284508f6ea103a570c75245dd81f878b8850d59366800bcceec284e1076a189fe3189d533d6cbf0748e9e0732e2941d062246e5df0046bd552ec79b1720d
 DIST genpatches-4.5-2.extras.tar.xz 16284 SHA256 0e58613bcad4326d41189563633558e3b72fa69f0673408e037c991e236a4826 SHA512 dc07438a67d77f2bf2378340b8d9c4d59f1f90dcf33ed0e4f844a520359a390f5a1cc8348777b67f11511a1e539dd0e8dbbdb20e8358f642538b4174ec9a5823 WHIRLPOOL 150daa4a4f48d2b14897e1e0f0a3e649f3308fe284f4725c01b9592196b38ab80e9099b182a435cde2b68152d90732f3033e77387ba2b414e8eaabedd62225da
+DIST genpatches-4.5-3.base.tar.xz 79372 SHA256 989656536ab8dc8e42e930b3e661eb3920ff223b97503d5e4edb695892947d9e SHA512 8eaa2a1f2e5ad1ede4bfa92e4a5ad46cd07c94c39e491ab39a5dc026782c53014a38733b8e47f1f09985750626cfdc39b10d99364b37bf74423446d6452c8424 WHIRLPOOL 48c94b3e86c5b87b686ea51e040770323b5c0ba269b820de8233b52c2683a7393d8c344f869261c5a44dacdf8bb64cffe47d2a2981009c46875d7961b9e807fc
+DIST genpatches-4.5-3.experimental.tar.xz 4900 SHA256 e56595df9bbc228fa01a0d22cc76856e90d2cf2593f5c45ba30f75cb15edcefb SHA512 73e4b7f1ec424f2cdc25a635419bb45d50b3f811182f9ff5b2952e543358b80f25a21617ca0289290af291d09534184e5fd6136b7a21f287b8d29b1dab005359 WHIRLPOOL 3ec7a9d3c4a16036f131a8e616582f29dbf0c68047a1f5ab52a65b50c5fff3072e61a878d4d1d350dc28d0ef662a5f268d81b204f3213344c30001cc5580c7bb
+DIST genpatches-4.5-3.extras.tar.xz 16284 SHA256 720c66b1195b09a0ac5989f4b3e02a48e40fa9e4e8ca711f39880676c4b0ee2b SHA512 d9fd94f2524e269d1c134808799d6fcf790b9c33cd8db95f0e14be9f2e2701ec9392e87b37d25e67a18e59137a1448b779c1bb2c140d6d0efc384b0f738b8917 WHIRLPOOL fc258f467beac9c0ba2016bbc8c3145ab6ee549b0eac6750fef3474bf5abf5f5e9cb7eda156f4609f2fde1ae090f1353435873607de5448b70f84e26a74b4a7c
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.7.ebuild
new file mode 100644
index 000000000000..278fe4e4a559
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.5.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.5.1.ebuild
new file mode 100644
index 000000000000..075d1e03d39b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="3"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 99eb77850b7f..cc781f3a68ca 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1 +1,2 @@
 DIST tdb-1.3.8.tar.gz 494106 SHA256 0605ac0427eac9c23bf61ebfd8206a07d5ece198498eab1769cd0cfb6e7de6b1 SHA512 9a7040206bbaae419a296714fe14fcbd3b67c0cef2b0f33563d52336aac2fe814049f5136a148fb049a273bb36fe81e3d777df58869c93f45d6e42b4adf9970b WHIRLPOOL 61070a71aba9b44d5141844ffac6b4657ddc938850934fe00ff7312d9f76e1c318e37764b60fbac255ff5b8dc8d8226f668f80315fccdc67550eeb9bd1c4bc25
+DIST tdb-1.3.9.tar.gz 493585 SHA256 7101f726e6d5c70f14e577b01c133e2e6059c4455239115e56a12ba64fc084d2 SHA512 ee724e54d6eef51cb368bccbf41a1ab326f3b618e8366d8b43b91953a30e4c486842cd7f41b83f613becb1e4117ce4831b1065d6efdcf14bb96b545ef1dd8175 WHIRLPOOL eb27d028b0f09c66e6e64783cd9bbf44d238bf70816879455ae59d268df7dd07ae0f9f4b634ac78224ca9b6b867e711b13cdb9aa75cfb6a2154d447def761d17
diff --git a/sys-libs/tdb/tdb-1.3.9.ebuild b/sys-libs/tdb/tdb-1.3.9.ebuild
new file mode 100644
index 000000000000..6f54a5a44321
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.3.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="A simple database API"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+	default
+	python_fix_shebang .
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=()
+	if ! multilib_is_native_abi || ! use python; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure \
+		"${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
new file mode 100644
index 000000000000..9bef84b87ec0
--- /dev/null
+++ b/sys-libs/uclibc-ng/Manifest
@@ -0,0 +1 @@
+DIST uClibc-ng-1.0.13.tar.bz2 2950676 SHA256 2d3530fa9321022db30c4576b272d8113efb75393f9b43281bd3b014c75bd2d4 SHA512 aae994d06119756161b9a38eeb8b4a0b8531dfaf13094158218cce2500cd02dcac9067160a5a2764d355e1208ee7cda04f4c1ddf7f6812c794f4680c938e9b22 WHIRLPOOL e612f9a152335c9b89fe6e10dcab0ad44978c205da8230597f3ff3b8adee81a95a71dfcec36afc9c0c262fa56d643de47a705840e841363a13b0af2fee686653
diff --git a/sys-libs/uclibc-ng/files/uclibc-compat.patch b/sys-libs/uclibc-ng/files/uclibc-compat.patch
new file mode 100644
index 000000000000..58277561b749
--- /dev/null
+++ b/sys-libs/uclibc-ng/files/uclibc-compat.patch
@@ -0,0 +1,12 @@
+diff -Naur uClibc-ng-1.0.13.orig/ldso/ldso/Makefile.in uClibc-ng-1.0.13/ldso/ldso/Makefile.in
+--- uClibc-ng-1.0.13.orig/ldso/ldso/Makefile.in	2016-03-13 21:48:40.000000000 +0000
++++ uClibc-ng-1.0.13/ldso/ldso/Makefile.in	2016-04-08 13:45:06.837079637 +0000
+@@ -76,8 +76,6 @@
+ $(ldso:.$(ABI_VERSION)=): | $(top_builddir)lib
+ $(ldso:.$(ABI_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
+ 	$(call link.so,$(ldso_FULL_NAME),$(ABI_VERSION))
+-	# link for backward compatibility
+-	(cd $(top_builddir)lib; ln -sf $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) $(UCLIBC_LDSO_NAME).so.0 )
+ 
+ $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
+ 	$(Q)$(RM) $@
diff --git a/sys-libs/uclibc-ng/metadata.xml b/sys-libs/uclibc-ng/metadata.xml
new file mode 100644
index 000000000000..1e21008dfac2
--- /dev/null
+++ b/sys-libs/uclibc-ng/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<longdescription>
+	uClibc-ng is a small C library for developing embedded Linux systems. It is much
+	smaller than the GNU C Library, but nearly all applications supported by glibc
+	also work perfectly with uClibc-ng. 
+	</longdescription>
+	<use>
+		<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.13.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.13.ebuild
new file mode 100644
index 000000000000..aec352394cfe
--- /dev/null
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.13.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
+	inherit git-r3
+	MY_P=uclibc-ng-${PV}
+else
+	MY_P=uClibc-ng-${PV}
+fi
+
+DESCRIPTION="C library for developing embedded Linux systems"
+HOMEPAGE="http://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug hardened iconv ipv6 rpc crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
+#    will delete the ld.so sym link prematurely and break the system. So we
+#    will hard block and give manual migration instructions.
+# 2) Currently uclibc and uclibc-ng's iconv are in bad shape.  We've been using
+#    the breakout library.  The disadvantage here is that we have to sprinkle
+#    LDFAGS=-liconv on build systems that need to link against libiconv.
+RDEPEND="
+	!!sys-libs/uclibc
+	iconv? ( dev-libs/libiconv )"
+
+S=${WORKDIR}/${MY_P}
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CHOST} == ${CTARGET} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+alt_build_kprefix() {
+	if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then
+		echo /usr/include
+	else
+		echo /usr/${CTARGET}/usr/include
+	fi
+}
+
+just_headers() {
+	use crosscompile_opts_headers-only && is_crosscompile
+}
+
+uclibc_endian() {
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "BIG";;
+		*" LSB "*) echo "LITTLE";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
+}
+
+kconfig_q_opt() {
+	local flag=$1; shift
+	case ${flag} in
+		y|n) ;;
+		*) flag=$(usex ${flag} y n) ;;
+	esac
+
+	local var="defs_${flag}"
+	eval "${var}+=( $* )"
+}
+
+get_opt() {
+	(
+	unset ${1}
+	. ${2:-"${S}"/.config}
+	echo ${!1}
+	)
+}
+
+make_oldconfig() {
+	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
+}
+
+make_config() {
+	restore_config .config
+	if [ -f .config ]; then
+		make_oldconfig
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	emake ARCH=$1 defconfig >/dev/null
+
+	local defs_{y,n}
+
+	# These are forced off
+	defs_n=(
+		DOASSERTS
+		DODEBUG_PT
+		HAS_NO_THREADS
+		PROPOLICE_BLOCK_ABRT
+		SSP_QUICK_CANARY
+		SUPPORT_LD_DEBUG_EARLY
+		UCLIBC_HAS_CTYPE_UNSAFE
+		UCLIBC_HAS_LOCALE
+		UCLIBC_HAS_SSP_COMPAT
+	)
+
+	# These are forced on
+	defs_y=(
+		COMPAT_ATEXIT
+		DO_C99_MATH
+		DO_XSI_MATH
+		FORCE_SHAREABLE_TEXT_SEGMENTS
+		LDSO_GNU_HASH_SUPPORT
+		LDSO_PRELINK_SUPPORT
+		LDSO_PRELOAD_FILE_SUPPORT
+		LDSO_RUNPATH_OF_EXECUTABLE
+		LDSO_STANDALONE_SUPPORT
+		MALLOC_GLIBC_COMPAT
+		PROPOLICE_BLOCK_SEGV
+		PTHREADS_DEBUG_SUPPORT
+		UCLIBC_HAS_ARC4RANDOM
+		UCLIBC_HAS_BACKTRACE
+		UCLIBC_HAS_BSD_RES_CLOSE
+		UCLIBC_HAS_CONTEXT_FUNCS
+		UCLIBC_HAS_CTYPE_CHECKED
+		UCLIBC_HAS_EXTRA_COMPAT_RES_STATE
+		UCLIBC_HAS_FENV
+		UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
+		UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE
+		UCLIBC_HAS_FOPEN_LARGEFILE_MODE
+		UCLIBC_HAS_FTS
+		UCLIBC_HAS_FTW
+		UCLIBC_HAS_GETPT
+		UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
+		UCLIBC_HAS_GLIBC_CUSTOM_STREAMS
+		UCLIBC_HAS_GNU_GLOB
+		UCLIBC_HAS_HEXADECIMAL_FLOATS
+		UCLIBC_HAS_LIBNSL_STUB
+		UCLIBC_HAS_LIBRESOLV_STUB
+		UCLIBC_HAS_LIBUTIL
+		UCLIBC_HAS_NFTW
+		UCLIBC_HAS_OBSOLETE_BSD_SIGNAL
+		UCLIBC_HAS_OBSTACK
+		UCLIBC_HAS_PRINTF_M_SPEC
+		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
+		UCLIBC_HAS_RESOLVER_SUPPORT
+		UCLIBC_HAS_SHA256_CRYPT_IMPL
+		UCLIBC_HAS_SHA512_CRYPT_IMPL
+		UCLIBC_HAS_SSP
+		UCLIBC_HAS_STUBS
+		UCLIBC_HAS_SYS_ERRLIST
+		UCLIBC_HAS_SYS_SIGLIST
+		UCLIBC_HAS_THREADS_NATIVE
+		UCLIBC_HAS_TZ_FILE_READ_MANY
+		UCLIBC_HAS_UTMP
+		UCLIBC_HAS_UTMPX
+		UCLIBC_HAS_WCHAR
+		UCLIBC_HAS_WORDEXP
+		UCLIBC_NTP_LEGACY
+		UCLIBC_SUPPORT_AI_ADDRCONFIG
+		UCLIBC_SUSV2_LEGACY
+		UCLIBC_SUSV3_LEGACY
+		UCLIBC_SUSV3_LEGACY_MACROS
+		UCLIBC_SUSV4_LEGACY
+		UCLIBC_USE_NETLINK
+	)
+
+	sed -i -e '/ARCH_.*_ENDIAN/d' .config
+	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
+
+	kconfig_q_opt debug DODEBUG
+	kconfig_q_opt debug SUPPORT_LD_DEBUG
+	kconfig_q_opt debug UCLIBC_HAS_PROFILING
+
+	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
+
+	kconfig_q_opt rpc UCLIBC_HAS_RPC
+	kconfig_q_opt rpc UCLIBC_HAS_FULL_RPC
+	kconfig_q_opt rpc UCLIBC_HAS_REENTRANT_RPC
+
+	kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK
+	kconfig_q_opt hardened UCLIBC_BUILD_NOW
+	kconfig_q_opt hardened UCLIBC_BUILD_PIE
+	kconfig_q_opt hardened UCLIBC_BUILD_RELRO
+	kconfig_q_opt hardened UCLIBC_BUILD_SSP
+
+	local count def
+	for count in 1 2 ; do
+		# Run twice as some config opts depend on others being enabled first.
+		for def in ${defs_y[@]} ; do
+			sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config
+		done
+		for def in ${defs_n[@]} ; do
+			sed -i -e "s|${def}=y|# ${def} is not set|g" .config
+		done
+		make_oldconfig
+	done
+
+	einfo "Enabled options:"
+	for def in ${defs_y[@]} ; do
+		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
+	done
+	einfo "Disabled options:"
+	for def in ${defs_n[@]} ; do
+		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
+	done
+
+	# setup build and run paths
+	sed -i \
+		-e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \
+		-e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \
+		-e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \
+		-e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \
+		-e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \
+		-e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \
+		.config || die
+
+	make_oldconfig
+}
+
+pkg_setup() {
+	# Make sure our CHOST is a uclibc toolchain for native compiling
+	if [[ ${CHOST} == ${CTARGET} ]]; then
+		case ${CHOST} in
+			*-uclinux*|*-uclibc*) ;;
+			*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
+		esac
+	fi
+
+	# uClibc-ng doesn't carry old Linux threads, and since we force
+	# threading our only choice is NPTL which requires i486 and later.
+	[[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)."
+}
+
+src_prepare() {
+	local version subversion
+
+	# uclibc-ng tries to create a two sym link with ld.so,
+	# ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
+	# where MAJOR_VERSION != 0 indicates the ABI verison.
+	# We want to get rid of this and just have ABI = 0.
+	eapply "${FILESDIR}"/uclibc-compat.patch
+
+	# We need to change the major.minor.sublevel of uclibc-ng.
+	# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
+	# If we really want the ABI bump, we'll have to hack the gcc
+	# spec file and change the '*link:' rule.
+	version=( $(get_version_components) )
+	if [[ -z ${version[1]} ]]; then
+		subversion=0
+	else
+		if [[ -z ${version[2]} ]]; then
+			subversion=${version[1]}
+		else
+			subversion=${version[1]}.${version[2]}
+		fi
+	fi
+
+	sed -i \
+		-e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
+		-e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+		-e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
+		Rules.mak || die
+
+	eapply_user
+}
+
+src_configure() {
+	# Map our toolchain arch name to the name expected by uClibc-ng.
+	local target=$(tc-arch)
+	case ${target} in
+		amd64) target="x86_64";;
+		arm)   target="arm";;
+		mips)  target="mips";;
+		ppc)   target="powerpc";;
+		x86)   target="i386";;
+	esac
+
+	# Do arch specific configuration by changing the defaults in
+	# extra/Configs/Config.<arch>.  If these are not overridden
+	# by an save .config, they will be selected by default.
+
+	# For i386, i486, i586 and i686
+	local cpu
+	if [[ ${target} == "i386" ]]; then
+		[[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86"
+		sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \
+			extra/Configs/Config.i385 || die
+	fi
+
+	# For arm
+	if [[ ${target} == "arm" ]]; then
+		sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm
+	fi
+
+	# For mips
+	if [[ ${target} == "mips" ]]; then
+		sed -i -e "s|default CONFIG_MIPS_O32_ABI|CONFIG_MIPS_${ABI^[on]}_ABI|" \
+			extra/Configs/Config.mips || die
+	fi
+
+	# We set HOSTCC to the proper tuple rather than just 'gcc'
+	sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak
+
+	make_config ${target}
+
+	einfo
+	einfo "Runtime Prefix: /"
+	einfo "Devel Prefix:   /usr"
+	einfo "Kernel Prefix:  $(alt_build_kprefix)"
+	einfo "CBUILD:         ${CBUILD}"
+	einfo "CHOST:          ${CHOST}"
+	einfo "CTARGET:        ${CTARGET}"
+	einfo "ABI:            ${ABI}"
+	einfo "ENDIAN:         $(uclibc_endian)"
+	einfo
+}
+
+src_compile() {
+	emake headers
+	just_headers && return 0
+
+	emake
+	if is_crosscompile ; then
+		emake -C utils hostutils
+	else
+		emake utils
+	fi
+}
+
+src_test() {
+	is_crosscompile && return 0
+
+	# assert test fails on pax/grsec enabled kernels
+	# normal vfork test fails in sandbox (both glibc/uclibc)
+	emake UCLIBC_ONLY=1 check
+}
+
+src_install() {
+	local sysroot=${D}
+	is_crosscompile && sysroot+="/usr/${CTARGET}"
+
+	local target="install"
+	just_headers && target="install_headers"
+	emake DESTDIR="${sysroot}" ${target}
+
+	save_config .config
+
+	# remove files coming from kernel-headers
+	rm -rf "${sysroot}"/usr/include/{linux,asm*}
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		dosym usr/include /usr/${CTARGET}/sys-include
+		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig
+			newbin utils/ldd.host ${CTARGET}-ldd
+		fi
+		return 0
+	fi
+
+	emake DESTDIR="${D}" install_utils
+	dobin extra/scripts/getent
+	dodoc README docs/*.txt
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	if [ ! -e "${ROOT}"/etc/TZ ] ; then
+		ewarn "Please remember to set your timezone in /etc/TZ"
+		mkdir -p "${ROOT}"/etc
+		echo "UTC" > "${ROOT}"/etc/TZ
+	fi
+	[ "${ROOT}" != "/" ] && return 0
+	# update cache before reloading init
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
new file mode 100644
index 000000000000..aec352394cfe
--- /dev/null
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
+	inherit git-r3
+	MY_P=uclibc-ng-${PV}
+else
+	MY_P=uClibc-ng-${PV}
+fi
+
+DESCRIPTION="C library for developing embedded Linux systems"
+HOMEPAGE="http://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug hardened iconv ipv6 rpc crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
+#    will delete the ld.so sym link prematurely and break the system. So we
+#    will hard block and give manual migration instructions.
+# 2) Currently uclibc and uclibc-ng's iconv are in bad shape.  We've been using
+#    the breakout library.  The disadvantage here is that we have to sprinkle
+#    LDFAGS=-liconv on build systems that need to link against libiconv.
+RDEPEND="
+	!!sys-libs/uclibc
+	iconv? ( dev-libs/libiconv )"
+
+S=${WORKDIR}/${MY_P}
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CHOST} == ${CTARGET} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+alt_build_kprefix() {
+	if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then
+		echo /usr/include
+	else
+		echo /usr/${CTARGET}/usr/include
+	fi
+}
+
+just_headers() {
+	use crosscompile_opts_headers-only && is_crosscompile
+}
+
+uclibc_endian() {
+	# XXX: this wont work for a toolchain which is bi-endian, but we
+	#      dont have any such thing at the moment, so not a big deal
+	touch "${T}"/endian.s
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "BIG";;
+		*" LSB "*) echo "LITTLE";;
+		*)         echo "NFC";;
+	esac
+	rm -f "${T}"/endian.{s,o}
+}
+
+kconfig_q_opt() {
+	local flag=$1; shift
+	case ${flag} in
+		y|n) ;;
+		*) flag=$(usex ${flag} y n) ;;
+	esac
+
+	local var="defs_${flag}"
+	eval "${var}+=( $* )"
+}
+
+get_opt() {
+	(
+	unset ${1}
+	. ${2:-"${S}"/.config}
+	echo ${!1}
+	)
+}
+
+make_oldconfig() {
+	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
+}
+
+make_config() {
+	restore_config .config
+	if [ -f .config ]; then
+		make_oldconfig
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	emake ARCH=$1 defconfig >/dev/null
+
+	local defs_{y,n}
+
+	# These are forced off
+	defs_n=(
+		DOASSERTS
+		DODEBUG_PT
+		HAS_NO_THREADS
+		PROPOLICE_BLOCK_ABRT
+		SSP_QUICK_CANARY
+		SUPPORT_LD_DEBUG_EARLY
+		UCLIBC_HAS_CTYPE_UNSAFE
+		UCLIBC_HAS_LOCALE
+		UCLIBC_HAS_SSP_COMPAT
+	)
+
+	# These are forced on
+	defs_y=(
+		COMPAT_ATEXIT
+		DO_C99_MATH
+		DO_XSI_MATH
+		FORCE_SHAREABLE_TEXT_SEGMENTS
+		LDSO_GNU_HASH_SUPPORT
+		LDSO_PRELINK_SUPPORT
+		LDSO_PRELOAD_FILE_SUPPORT
+		LDSO_RUNPATH_OF_EXECUTABLE
+		LDSO_STANDALONE_SUPPORT
+		MALLOC_GLIBC_COMPAT
+		PROPOLICE_BLOCK_SEGV
+		PTHREADS_DEBUG_SUPPORT
+		UCLIBC_HAS_ARC4RANDOM
+		UCLIBC_HAS_BACKTRACE
+		UCLIBC_HAS_BSD_RES_CLOSE
+		UCLIBC_HAS_CONTEXT_FUNCS
+		UCLIBC_HAS_CTYPE_CHECKED
+		UCLIBC_HAS_EXTRA_COMPAT_RES_STATE
+		UCLIBC_HAS_FENV
+		UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
+		UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE
+		UCLIBC_HAS_FOPEN_LARGEFILE_MODE
+		UCLIBC_HAS_FTS
+		UCLIBC_HAS_FTW
+		UCLIBC_HAS_GETPT
+		UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
+		UCLIBC_HAS_GLIBC_CUSTOM_STREAMS
+		UCLIBC_HAS_GNU_GLOB
+		UCLIBC_HAS_HEXADECIMAL_FLOATS
+		UCLIBC_HAS_LIBNSL_STUB
+		UCLIBC_HAS_LIBRESOLV_STUB
+		UCLIBC_HAS_LIBUTIL
+		UCLIBC_HAS_NFTW
+		UCLIBC_HAS_OBSOLETE_BSD_SIGNAL
+		UCLIBC_HAS_OBSTACK
+		UCLIBC_HAS_PRINTF_M_SPEC
+		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
+		UCLIBC_HAS_RESOLVER_SUPPORT
+		UCLIBC_HAS_SHA256_CRYPT_IMPL
+		UCLIBC_HAS_SHA512_CRYPT_IMPL
+		UCLIBC_HAS_SSP
+		UCLIBC_HAS_STUBS
+		UCLIBC_HAS_SYS_ERRLIST
+		UCLIBC_HAS_SYS_SIGLIST
+		UCLIBC_HAS_THREADS_NATIVE
+		UCLIBC_HAS_TZ_FILE_READ_MANY
+		UCLIBC_HAS_UTMP
+		UCLIBC_HAS_UTMPX
+		UCLIBC_HAS_WCHAR
+		UCLIBC_HAS_WORDEXP
+		UCLIBC_NTP_LEGACY
+		UCLIBC_SUPPORT_AI_ADDRCONFIG
+		UCLIBC_SUSV2_LEGACY
+		UCLIBC_SUSV3_LEGACY
+		UCLIBC_SUSV3_LEGACY_MACROS
+		UCLIBC_SUSV4_LEGACY
+		UCLIBC_USE_NETLINK
+	)
+
+	sed -i -e '/ARCH_.*_ENDIAN/d' .config
+	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
+
+	kconfig_q_opt debug DODEBUG
+	kconfig_q_opt debug SUPPORT_LD_DEBUG
+	kconfig_q_opt debug UCLIBC_HAS_PROFILING
+
+	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
+
+	kconfig_q_opt rpc UCLIBC_HAS_RPC
+	kconfig_q_opt rpc UCLIBC_HAS_FULL_RPC
+	kconfig_q_opt rpc UCLIBC_HAS_REENTRANT_RPC
+
+	kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK
+	kconfig_q_opt hardened UCLIBC_BUILD_NOW
+	kconfig_q_opt hardened UCLIBC_BUILD_PIE
+	kconfig_q_opt hardened UCLIBC_BUILD_RELRO
+	kconfig_q_opt hardened UCLIBC_BUILD_SSP
+
+	local count def
+	for count in 1 2 ; do
+		# Run twice as some config opts depend on others being enabled first.
+		for def in ${defs_y[@]} ; do
+			sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config
+		done
+		for def in ${defs_n[@]} ; do
+			sed -i -e "s|${def}=y|# ${def} is not set|g" .config
+		done
+		make_oldconfig
+	done
+
+	einfo "Enabled options:"
+	for def in ${defs_y[@]} ; do
+		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
+	done
+	einfo "Disabled options:"
+	for def in ${defs_n[@]} ; do
+		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
+	done
+
+	# setup build and run paths
+	sed -i \
+		-e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \
+		-e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \
+		-e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \
+		-e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \
+		-e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \
+		-e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \
+		.config || die
+
+	make_oldconfig
+}
+
+pkg_setup() {
+	# Make sure our CHOST is a uclibc toolchain for native compiling
+	if [[ ${CHOST} == ${CTARGET} ]]; then
+		case ${CHOST} in
+			*-uclinux*|*-uclibc*) ;;
+			*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
+		esac
+	fi
+
+	# uClibc-ng doesn't carry old Linux threads, and since we force
+	# threading our only choice is NPTL which requires i486 and later.
+	[[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)."
+}
+
+src_prepare() {
+	local version subversion
+
+	# uclibc-ng tries to create a two sym link with ld.so,
+	# ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
+	# where MAJOR_VERSION != 0 indicates the ABI verison.
+	# We want to get rid of this and just have ABI = 0.
+	eapply "${FILESDIR}"/uclibc-compat.patch
+
+	# We need to change the major.minor.sublevel of uclibc-ng.
+	# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
+	# If we really want the ABI bump, we'll have to hack the gcc
+	# spec file and change the '*link:' rule.
+	version=( $(get_version_components) )
+	if [[ -z ${version[1]} ]]; then
+		subversion=0
+	else
+		if [[ -z ${version[2]} ]]; then
+			subversion=${version[1]}
+		else
+			subversion=${version[1]}.${version[2]}
+		fi
+	fi
+
+	sed -i \
+		-e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
+		-e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+		-e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
+		Rules.mak || die
+
+	eapply_user
+}
+
+src_configure() {
+	# Map our toolchain arch name to the name expected by uClibc-ng.
+	local target=$(tc-arch)
+	case ${target} in
+		amd64) target="x86_64";;
+		arm)   target="arm";;
+		mips)  target="mips";;
+		ppc)   target="powerpc";;
+		x86)   target="i386";;
+	esac
+
+	# Do arch specific configuration by changing the defaults in
+	# extra/Configs/Config.<arch>.  If these are not overridden
+	# by an save .config, they will be selected by default.
+
+	# For i386, i486, i586 and i686
+	local cpu
+	if [[ ${target} == "i386" ]]; then
+		[[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86"
+		sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \
+			extra/Configs/Config.i385 || die
+	fi
+
+	# For arm
+	if [[ ${target} == "arm" ]]; then
+		sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm
+	fi
+
+	# For mips
+	if [[ ${target} == "mips" ]]; then
+		sed -i -e "s|default CONFIG_MIPS_O32_ABI|CONFIG_MIPS_${ABI^[on]}_ABI|" \
+			extra/Configs/Config.mips || die
+	fi
+
+	# We set HOSTCC to the proper tuple rather than just 'gcc'
+	sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak
+
+	make_config ${target}
+
+	einfo
+	einfo "Runtime Prefix: /"
+	einfo "Devel Prefix:   /usr"
+	einfo "Kernel Prefix:  $(alt_build_kprefix)"
+	einfo "CBUILD:         ${CBUILD}"
+	einfo "CHOST:          ${CHOST}"
+	einfo "CTARGET:        ${CTARGET}"
+	einfo "ABI:            ${ABI}"
+	einfo "ENDIAN:         $(uclibc_endian)"
+	einfo
+}
+
+src_compile() {
+	emake headers
+	just_headers && return 0
+
+	emake
+	if is_crosscompile ; then
+		emake -C utils hostutils
+	else
+		emake utils
+	fi
+}
+
+src_test() {
+	is_crosscompile && return 0
+
+	# assert test fails on pax/grsec enabled kernels
+	# normal vfork test fails in sandbox (both glibc/uclibc)
+	emake UCLIBC_ONLY=1 check
+}
+
+src_install() {
+	local sysroot=${D}
+	is_crosscompile && sysroot+="/usr/${CTARGET}"
+
+	local target="install"
+	just_headers && target="install_headers"
+	emake DESTDIR="${sysroot}" ${target}
+
+	save_config .config
+
+	# remove files coming from kernel-headers
+	rm -rf "${sysroot}"/usr/include/{linux,asm*}
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		dosym usr/include /usr/${CTARGET}/sys-include
+		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
+			newbin utils/ldconfig.host ${CTARGET}-ldconfig
+			newbin utils/ldd.host ${CTARGET}-ldd
+		fi
+		return 0
+	fi
+
+	emake DESTDIR="${D}" install_utils
+	dobin extra/scripts/getent
+	dodoc README docs/*.txt
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	if [ ! -e "${ROOT}"/etc/TZ ] ; then
+		ewarn "Please remember to set your timezone in /etc/TZ"
+		mkdir -p "${ROOT}"/etc
+		echo "UTC" > "${ROOT}"/etc/TZ
+	fi
+	[ "${ROOT}" != "/" ] && return 0
+	# update cache before reloading init
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 6c3c0a09e801..be9d8e6897f9 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,6 +31,11 @@ SLOT="0"
 IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
 RESTRICT="strip"
 
+# We cannot migrate between uclibc and uclibc-ng because as soon as portage
+# updates the ld.so sym link, the system breaks.  Ideally this should be a
+# hard blocker, but EAPI=0 doesn't allow hard blockers.
+RDEPEND="!sys-libs/uclibc-ng"
+
 S=${WORKDIR}/${MY_P}
 
 is_crosscompile() {
diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index a6dd21f56729..2d30cfe367e8 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,6 +32,11 @@ SLOT="0"
 IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
 RESTRICT="strip"
 
+# We cannot migrate between uclibc and uclibc-ng because as soon as portage
+# updates the ld.so sym link, the system breaks.  Ideally this should be a
+# hard blocker, but EAPI=0 doesn't allow hard blockers.
+RDEPEND="!sys-libs/uclibc-ng"
+
 S=${WORKDIR}/${MY_P}
 
 is_crosscompile() {
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index 0d45e8364a25..5e54ad284ef9 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,6 +31,11 @@ SLOT="0"
 IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
 RESTRICT="strip"
 
+# We cannot migrate between uclibc and uclibc-ng because as soon as portage
+# updates the ld.so sym link, the system breaks.  Ideally this should be a
+# hard blocker, but EAPI=0 doesn't allow hard blockers.
+RDEPEND="!sys-libs/uclibc-ng"
+
 S=${WORKDIR}/${MY_P}
 
 is_crosscompile() {
diff --git a/virtual/libc/libc-0.ebuild b/virtual/libc/libc-0.ebuild
index 1fa8392b7057..66ff54987abc 100644
--- a/virtual/libc/libc-0.ebuild
+++ b/virtual/libc/libc-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,6 +13,6 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 RDEPEND="!prefix? (
 		elibc_glibc? ( sys-libs/glibc:2.2 )
 		elibc_musl? ( sys-libs/musl )
-		elibc_uclibc? ( sys-libs/uclibc )
+		elibc_uclibc? ( || ( sys-libs/uclibc sys-libs/uclibc-ng ) )
 		elibc_FreeBSD? ( sys-freebsd/freebsd-lib )
 	)"
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 71f817868223..4acadafef100 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_51.0.2700.0-1_amd64.deb 49151708 SHA256 655e1e4730c413f9a08d69748e3257e6ada39a6db7394da7954c06181c8b1aa2 SHA512 9e241071c802f2b5b5e21a04371c930d8c87df7e44daddf22ad2d512498c1f7d6eb2d460a6bba035047f7de99186526109c34a40452368aea3732cc4c9eaaf9c WHIRLPOOL e3e2052daa845f3ceaef1d2b46f1a16b71677a5e19d6ef28fa2013b90b9f1f62c4c8f9ca9cc5e59583900aa9b43973aadde44814e4aadde7e22a9f2249531311
+DIST google-chrome-unstable_51.0.2704.4-1_amd64.deb 49057440 SHA256 e390d9d34887a79b522ed0afd9073184e1bf43188f3c3f7663c8275e8f16ca9d SHA512 41d10a8520353088dde6e984029cdcaf7ce74c26f91e8b2c7087f26482823bfb0929cbca918fdfdb505ec2fd5c1efef8d58e31e0be352f3faa43e5018058426e WHIRLPOOL 0688fb69b7bbfa377a5e14620fcc016d2b696f1300deb67351f777c0a681aebe0c7c4d8c9b776bc2ac0cf21d79054375a61be63c57928a273c1693436681a8e9
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-51.0.2700.0_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-51.0.2704.4.ebuild
similarity index 99%
rename from www-client/google-chrome-unstable/google-chrome-unstable-51.0.2700.0_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-51.0.2704.4.ebuild
index a97043e77a62..bc797d3afdf3 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-51.0.2700.0_p1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-51.0.2704.4.ebuild
@@ -19,7 +19,7 @@ else
 	MY_PN=${PN}
 fi
 
-MY_P="${MY_PN}_${PV/_p/-}"
+MY_P="${MY_PN}_${PV}-1"
 
 SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c59c2f18c221..c874217519e4 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,5 +2,5 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_36.0.2130.32_amd64.deb 47201406 SHA256 dfd556c59f5b1b415101c01856d22d4f84009cc27485d906f5062bb076df2425 SHA512 c26eb7679e70088dea486b111dae548817dc3fd32b93ee40dd7c72a95eb76c7770294a66dffdcdab1349563ffcdb8ac8f85d91136a5037cf412a0592b153017a WHIRLPOOL 70f8b2163e9621adb056bf5b60f6d88a345106b932a979ec0c89c16c586fb0c3c9170344a08c86e5c8bea8084b45c0cfbf0f0cd1b6f90964816abf1bbe4163c5
 DIST opera-stable_36.0.2130.46_amd64.deb 47797720 SHA256 0de4ca59067b33ed5cf472f93d63bbda0e4c63a60d37b5fca3d7e0fd06c591cc SHA512 c6c7362cabc32d1f5b8b3deaf19e1701f44ad92877d8e8ca053f00ba4957d872604aa60159e3b4b6822979167233b4c454f5f9069321c6bd56c146a84a4ae3f3 WHIRLPOOL 9167712a7931ae573c586d13f21fdda95e8e2a3dcdf8a18f99210391602f8b821308f9440d574ba847cb10fd78d209875bd7825e8de3c9acb0e4c91ed5b9a39c
+DIST opera-stable_36.0.2130.65_amd64.deb 47347302 SHA256 f6fd496f3cafcb5d12540b9b3ee7ec5fc2d8f3ccfd525d3bb537cc3020efaa31 SHA512 741f84e71c41806b60b56231ab2e1c274e33156118557da773de17c7f8899e489e0e1628bd512a2258b4f2252657ee987e2170734bada99f6aaa68f01a34b2b6 WHIRLPOOL fc4b28fd05766a3186820949180d78cd1b25b6cd00cb9621737e8eade6574eb014d5fa039a9adfbc3c33ac8df351f4d764e398075f4fd41a6105b8289ac43c1c
diff --git a/www-client/opera/opera-36.0.2130.32.ebuild b/www-client/opera/opera-36.0.2130.65.ebuild
similarity index 100%
rename from www-client/opera/opera-36.0.2130.32.ebuild
rename to www-client/opera/opera-36.0.2130.65.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index c85b9878ee59..47ce44ed1805 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_50.0.2661.66-1_amd64.deb 48518778 SHA256 5bf1cd7d819b8b2f9ec6cce554db95fa067f9df42d9582072980076bb72161e7 SHA512 6df1435d843d796003b4ba6735185716f0336fb2bbb171ab860c31fa797c572ee7034fe9aa1854b0deb1630439ae603be477609aaedd67a291344fbc45f6a856 WHIRLPOOL 4af5a465a227ac8305aada930151ece54b2d1b38acfa5bba85e0064e89be3c32f596d8209a5be8962e44ad21753cfedc2efbe6c40b303defda77d8d44710dd53
 DIST google-chrome-stable_49.0.2623.112-1_amd64.deb 48475486 SHA256 baf81c2bf9c96b75653eace1a40b354f3b3ab7b9256d77c26d192752bb03fce8 SHA512 df873c535ac8dbeaf37ff633b34cf645a53f97994cd79908dd3f431434f3d5e421e08d894b60101093691b929f6915c6c2fbdd41d27e07080eac0321020152b0 WHIRLPOOL e193f98d466142bbb0c7720a35e7d56edd7eb2b260efc0c359567772318003db5e9f231ed91d332a53b4fdb7d88706095d3c3cd68720f4f431d7668883d136f9
-DIST google-chrome-unstable_51.0.2700.0-1_amd64.deb 49151708 SHA256 655e1e4730c413f9a08d69748e3257e6ada39a6db7394da7954c06181c8b1aa2 SHA512 9e241071c802f2b5b5e21a04371c930d8c87df7e44daddf22ad2d512498c1f7d6eb2d460a6bba035047f7de99186526109c34a40452368aea3732cc4c9eaaf9c WHIRLPOOL e3e2052daa845f3ceaef1d2b46f1a16b71677a5e19d6ef28fa2013b90b9f1f62c4c8f9ca9cc5e59583900aa9b43973aadde44814e4aadde7e22a9f2249531311
+DIST google-chrome-unstable_51.0.2704.4-1_amd64.deb 49057440 SHA256 e390d9d34887a79b522ed0afd9073184e1bf43188f3c3f7663c8275e8f16ca9d SHA512 41d10a8520353088dde6e984029cdcaf7ce74c26f91e8b2c7087f26482823bfb0929cbca918fdfdb505ec2fd5c1efef8d58e31e0be352f3faa43e5018058426e WHIRLPOOL 0688fb69b7bbfa377a5e14620fcc016d2b696f1300deb67351f777c0a681aebe0c7c4d8c9b776bc2ac0cf21d79054375a61be63c57928a273c1693436681a8e9
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-51.0.2700.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-51.0.2704.4_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-51.0.2700.0_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-51.0.2704.4_alpha.ebuild