diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 12ae58cfbc4e..155d8db1b326 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -1,2 +1,2 @@
-DIST tripwire-2.4.2.2-src.tar.bz2 716616 SHA256 e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad SHA512 be39757aac7b74d4deac6c5048d0964d839a32f8f2a0d1878c4246888c4d59e35a503413595178c7af3a0da80725d0b36c21026dc734e1f760c9affda017bbbb WHIRLPOOL beb99e1ae055947a4b94a45f51492bcc453def5a41188f853ff3285a85ef8e2921274b86b095b77dbcdc8f549358f6216996a75ba391247e17bf7a29c78849c5
 DIST tripwire-2.4.3.1.tar.gz 932665 SHA256 9744af4de7ecb1d643442eb22f08c819556494bb6f56f5879e22c3438f2db896 SHA512 fb5f0ad353da826a0e8381e534e0da1ac9335851e108a23053e378afd3aec6e66931446addbf0ba8d55eaa8d3148c471056e26095aeff7696ed9b6d3633cdf90 WHIRLPOOL b87447869d845be840399389a3e3ed5f9c961f6777c1b463755994876b191e08cca359273826466d34f2f32a26b597f23d130f6cb689224ed3ff58810efceed1
+DIST tripwire-2.4.3.2.tar.gz 967679 SHA256 25588c585f1af60958b3dce5bfc28e52c3237b2690dd5f4120e9c2f42d98fd2b SHA512 f3a3d5f12178d0766356d6280b3d993c29c1091357402661f0a4bb7676c640a147b74050c64e910c1210adef11903bde463813446e2c0ee9a34038876928bdfd WHIRLPOOL ac9812f3ec41afed5951e871d0ddad64eef3514a4cae071f414c7fa10d7318393d26107bb7007ca61554c328206b0da4790f0bc400fa7ea2159eb0b4f35e8303
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-buildnum.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-buildnum.patch
deleted file mode 100644
index becb0205e0de..000000000000
--- a/app-admin/tripwire/files/tripwire-2.4.2.2-buildnum.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -Nur a/src/buildnum.h b/src/buildnum.h
---- a/src/buildnum.h	2011-11-21 17:06:56.000000000 +0100
-+++ b/src/buildnum.h	2012-03-28 11:33:11.689974085 +0200
-@@ -1,2 +1,2 @@
--#define BUILD_NUM _T("2")
-+#define BUILD_NUM _T("0")
- 
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-exception-shadowing.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-exception-shadowing.patch
deleted file mode 100644
index 1347590ef462..000000000000
--- a/app-admin/tripwire/files/tripwire-2.4.2.2-exception-shadowing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/core/archive.cpp
-+++ b/src/core/archive.cpp
-@@ -886,8 +886,8 @@ void cLockedTemporaryFileArchive::OpenReadWrite( const TCHAR* filename, uint32 o
-         catch( eFSServices& e)
-           {
-             TSTRING errStr = TSS_GetString( cCore, core::STR_BAD_TEMPDIRECTORY );
--            eArchiveOpen e(strTempFile, errStr);
--            throw e;
-+            eArchiveOpen ex(strTempFile, errStr);
-+            throw ex;
-           }
-       }
-     ///////////////////////////////////////////////////////////////////////////////
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch
deleted file mode 100644
index b72aaef681af..000000000000
--- a/app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/configure.in b/configure.in
---- a/configure.in	2011-11-21 17:06:56.000000000 +0100
-+++ b/configure.in	2013-05-01 13:48:30.599978971 +0200
-@@ -6,7 +6,7 @@
- AC_CONFIG_SRCDIR([src/tw/tw.cpp])
- AC_CANONICAL_TARGET([])
- AM_INIT_AUTOMAKE(tripwire, 2.4.2.2)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- dnl #################################
- dnl Cleanup Cruft Leftover From Patch
diff --git a/app-admin/tripwire/files/tripwire-2.4.2.2-gcc-4.7.patch b/app-admin/tripwire/files/tripwire-2.4.2.2-gcc-4.7.patch
deleted file mode 100644
index e8d35fb2ae39..000000000000
--- a/app-admin/tripwire/files/tripwire-2.4.2.2-gcc-4.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur a/src/cryptlib/algebra.h b/src/cryptlib/algebra.h
---- a/src/cryptlib/algebra.h	2011-11-21 16:06:56.000000000 +0000
-+++ b/src/cryptlib/algebra.h	2012-06-19 14:13:13.930019454 +0000
-@@ -273,7 +273,7 @@
- 	Element g[3]={b, a};
- 	unsigned int i0=0, i1=1, i2=2;
- 
--	while (!Equal(g[i1], this->Zero()))
-+	while (!this->Equal(g[i1], this->Zero()))
- 	{
- 		g[i2] = Mod(g[i0], g[i1]);
- 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
-diff -Nur a/src/twadmin/twadmincl.cpp b/src/twadmin/twadmincl.cpp
---- a/src/twadmin/twadmincl.cpp	2011-11-21 16:06:56.000000000 +0000
-+++ b/src/twadmin/twadmincl.cpp	2012-06-19 14:13:40.270019532 +0000
-@@ -33,6 +33,9 @@
- // twadmincl.cpp -- command line parsing for twadmin
- //
- 
-+
-+#include <unistd.h>
-+
- #include "stdtwadmin.h"
- 
- #include "twadmincl.h"
diff --git a/app-admin/tripwire/files/tripwire-twpol-GENERIC.patch b/app-admin/tripwire/files/tripwire-twpol-GENERIC.patch
deleted file mode 100644
index 12b2419c5e71..000000000000
--- a/app-admin/tripwire/files/tripwire-twpol-GENERIC.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/policy/twpol-GENERIC.txt	2011-11-21 11:06:56.000000000 -0500
-+++ b/policy/twpol-GENERIC.txt	2013-09-11 08:13:34.000000000 -0400
-@@ -55,14 +55,14 @@
- ##############################################################################
- 
- @@section GLOBAL
--TWROOT=;
--TWBIN=;
--TWPOL=;
--TWDB=;
--TWSKEY=;
--TWLKEY=;
--TWREPORT=;
--HOSTNAME=;
-+#TWROOT=;
-+TWBIN=/usr/sbin;
-+TWPOL=/etc/tripwire;
-+TWDB=/var/lib/tripwire/YOUR_HOSTNAME.twd;
-+TWSKEY=/etc/tripwire;
-+TWLKEY=/etc/tripwire;
-+TWREPORT=/var/lib/tripwire/report;
-+#HOSTNAME=;
- 
- @@section FS
- SEC_CRIT      = $(IgnoreNone)-SHa ;  # Critical files that cannot change
diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild b/app-admin/tripwire/tripwire-2.4.3.2.ebuild
similarity index 82%
rename from app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
rename to app-admin/tripwire/tripwire-2.4.3.2.ebuild
index d8e135a14053..842387cd9def 100644
--- a/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Open Source File Integrity Checker and IDS"
 HOMEPAGE="http://www.tripwire.org/"
-SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2"
+SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -> ${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="libressl ssl static +tools"
 
 DEPEND="sys-devel/automake
@@ -26,16 +26,10 @@ RDEPEND="virtual/cron
 	ssl? ( dev-libs/openssl )"
 PDEPEND="tools? ( app-admin/mktwpol )"
 
-S="${WORKDIR}"/tripwire-"${PV}"-src
+S="${WORKDIR}/tripwire-open-source-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-fix-configure.patch
-	epatch "${FILESDIR}"/"${P}"-buildnum.patch
-	epatch "${FILESDIR}"/"${P}"-gcc-4.7.patch
-	epatch "${FILESDIR}"/"${PN}"-twpol-GENERIC.patch
-	epatch "${FILESDIR}"/"${P}"-exception-shadowing.patch
-
-	mv configure.in configure.ac || die
+	default
 	eautoreconf
 }
 
diff --git a/app-backup/cdbkup/cdbkup-1.0.ebuild b/app-backup/cdbkup/cdbkup-1.0.ebuild
deleted file mode 100644
index b37a20045088..000000000000
--- a/app-backup/cdbkup/cdbkup-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="performs full/incremental backups of local/remote filesystems onto CD-R(W)s"
-HOMEPAGE="http://cdbkup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdbkup/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-RDEPEND="virtual/cdrtools
-	virtual/eject
-	!app-misc/cdcat"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:doc/cdbkup:doc/${P}:" Makefile.in || die
-	epatch "${S}"/linuxtar_13.patch
-}
-
-src_compile() {
-	econf --with-snardir=/etc/cdbkup --with-dumpgrp=users
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc COMPLIANCE ChangeLog README TODO
-}
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 2a1ad7d2ffb1..1bda176e7b51 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1 +1,2 @@
 DIST argon2-20160821.tar.gz 1170019 SHA256 f81456ae31337a13a1a1b8ffe994d71ace741833a97a75f0c1a76259639bf3b8 SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f WHIRLPOOL ad476d23572ebe8701a71a79aff09dd08a0db3dde9b0a6104884a91309d651298adfb514cc7de9c585672ffbc816c9afae67cbbe09b3f9a300624036981c3d78
+DIST argon2-20161029.tar.gz 1506864 SHA256 fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892 WHIRLPOOL d90a0bbd17abf146e47ef5f1c9a759234396d9779213210484047120091b9e420f11926d502c1bb03a464625f64d3ec1df34f10ec5ba23572d18184fddaf113b
diff --git a/app-crypt/argon2/argon2-20160821.ebuild b/app-crypt/argon2/argon2-20160821.ebuild
index 372efd321795..8d11ba095d26 100644
--- a/app-crypt/argon2/argon2-20160821.ebuild
+++ b/app-crypt/argon2/argon2-20160821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="-static-libs"
+IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
 PATCHES=(
diff --git a/app-crypt/argon2/argon2-20161029.ebuild b/app-crypt/argon2/argon2-20161029.ebuild
new file mode 100644
index 000000000000..75fdaedd6b0d
--- /dev/null
+++ b/app-crypt/argon2/argon2-20161029.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
+HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
+SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 CC0-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/phc-winner-${P}"
+PATCHES=(
+	"${FILESDIR}/${P}-makefile-soname-symlinks.patch"
+	)
+src_prepare() {
+	default
+	if ! use static-libs; then
+		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
+	fi
+	sed -i -e 's/-O3 //' Makefile || die "sed failed"
+	sed -i -e 's/-g //' Makefile || die "sed failed"
+	sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
+	sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
+}
diff --git a/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
new file mode 100644
index 000000000000..11892de11158
--- /dev/null
+++ b/app-crypt/argon2/files/argon2-20161029-makefile-soname-symlinks.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index 1838c13..85aa710 100644
+--- a/Makefile
++++ b/Makefile
+@@ -87,8 +87,10 @@ endif
+ endif
+ 
+ LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
++LIB_SH_VERSION := $(LIB_SH).0
+ LIB_ST := lib$(LIB_NAME).a
+ LIBRARIES = $(LIB_SH) $(LIB_ST)
++INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
+ HEADERS = include/argon2.h
+ 
+ INSTALL = install
+@@ -153,9 +155,11 @@ format:
+ 			-i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
+ 
+ install: $(RUN) libs
++	mv $(LIB_SH) $(LIB_SH_VERSION)
++	ln -sf $(LIB_SH_VERSION) $(LIB_SH)
+ 	$(INSTALL) -d $(INST_INCLUDE)
+ 	$(INSTALL) $(HEADERS) $(INST_INCLUDE)
+ 	$(INSTALL) -d $(INST_LIBRARY)
+-	$(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
++	$(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
+ 	$(INSTALL) -d $(INST_BINARY)
+ 	$(INSTALL) $(RUN) $(INST_BINARY)
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 0d8cca6996ac..0bea827edbfc 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
 DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c WHIRLPOOL 584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
 DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
+DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
new file mode 100644
index 000000000000..2ff184331624
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+	${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
+	>=sys-apps/pcsc-lite-1.2.9
+	p11-kit? ( app-crypt/p11-kit )
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
+	else
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+	use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 57bb7b83b7df..c5f5f8f7995c 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-inherit autotools mozextension
+inherit eutils autotools mozextension multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
@@ -12,10 +12,9 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	SRC_URI=""
 else
-	MY_P="${P}-v${PV}"
-	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
+	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+	${P}.tar.gz"
 	KEYWORDS="~x86 ~amd64 ~arm"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 SLOT="0"
@@ -24,17 +23,22 @@ DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal
 
 HOMEPAGE="http://eid.belgium.be"
 
-IUSE="+gtk +xpi +dialogs"
+IUSE="+dialogs +gtk p11-kit +xpi"
 
 REQUIRED_USE="
 	dialogs? ( gtk )"
 
-RDEPEND="gtk? ( x11-libs/gtk+:= )
+RDEPEND="gtk? (
+		x11-libs/gtk+:*
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		!app-misc/eid-viewer-bin
+	)
 	>=sys-apps/pcsc-lite-1.2.9
-	net-libs/libproxy
+	p11-kit? ( app-crypt/p11-kit )
 	xpi? ( || ( >=www-client/firefox-bin-3.6.24
-		>=www-client/firefox-3.6.20 ) )
-	!app-misc/beid-runtime"
+		>=www-client/firefox-3.6.20 ) )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -42,28 +46,30 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	eapply_user
 
+	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
 	if [[ ${PV} == "9999" ]] ; then
 		use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
-
-		# Only in current git. Hopefully, in next release.
-		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
 	else
-		use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch
-	fi
-
-	if [[ ${PV} == "9999" ]] || ! use gtk ; then
-		eautoreconf
+		use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
 	fi
 
-	# Do that after autoreconf (if autoreconf is required)
-	# This patch is not mandatory, it's just to do things properly :-)
-	eapply "${FILESDIR}"/not_zip_xpi_plugin.patch
+	eautoreconf
 }
 
 src_configure() {
 	econf \
 		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		--with-gnu-ld \
 		--disable-static \
 		--disable-signed
 }
@@ -71,21 +77,22 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	if [[ ${PV} != "9999" ]] ; then
-		# Automatically done in current git. Hopefully, in next release.
-		rm doc/sdk/include/rsaref220/win32.h || die
-		doheader -r doc/sdk/include/*
-	fi
 	if use xpi; then
 		declare MOZILLA_FIVE_HOME
 		if has_version '>=www-client/firefox-3.6.20'; then
 			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
 		if has_version '>=www-client/firefox-bin-3.6.24'; then
 			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
 	fi
-	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
+	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+	use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
 }
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
new file mode 100644
index 000000000000..7990acaebdd2
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
@@ -0,0 +1,74 @@
+diff --git a/Makefile.am b/Makefile.am
+index de5416f..8e55277 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi 
+ 
+ xpipackage:
+ 	$(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 6e33315..fce4494 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+ 	dialogs/dialogsgtk/single_dialog.c
+ endif
+ 
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+ if P11KIT
+ dist_p11kitcf_DATA = beid.module
+ install-exec-hook:
+@@ -176,28 +174,4 @@ install-exec-hook:
+ 		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
+ endif
+ 
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+diff --git a/configure.ac b/configure.ac
+index 92bbb3b..a47e7c2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,14 +59,6 @@ fi
+ 
+ AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
+ 
+-if test "$have_gtk" = "no"
+-then
+-	AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives         ######
+ ###########################################################################
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
index f66ec182ca6c..7990acaebdd2 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -1,13 +1,13 @@
 diff --git a/Makefile.am b/Makefile.am
-index 65baf07..c264576 100644
+index de5416f..8e55277 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
  ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
  
 -SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi 
  
  xpipackage:
  	$(MAKE) -C plugins_tools/xpi xpipackage
@@ -54,10 +54,10 @@ index 6e33315..fce4494 100644
 -
  pkgconfig_DATA=libbeidpkcs11.pc
 diff --git a/configure.ac b/configure.ac
-index 6485b23..a1f9c93 100644
+index 92bbb3b..a47e7c2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -59,11 +59,6 @@ fi
+@@ -59,14 +59,6 @@ fi
  
  AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
  
@@ -66,6 +66,9 @@ index 6485b23..a1f9c93 100644
 -	AC_MSG_ERROR([At least one version of GTK is required.])
 -fi
 -
- PKG_CHECK_MODULES([XML2], [libxml-2.0])
- PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
- 
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives         ######
+ ###########################################################################
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index a0a9188d7f19..9cc32049c190 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -28,5 +28,8 @@ These three functions form the basis of the countless applications for your eID.
    <flag name="xpi">
     Build and install an extension for Mozilla browsers.
   </flag>
+  <flag name="p11-kit">
+    Support for app-crypt/p11-kit.
+  </flag>
 </use>
 </pkgmetadata>
diff --git a/app-crypt/zuluCrypt/Manifest b/app-crypt/zuluCrypt/Manifest
index e0769a8720d9..9c1858c96b45 100644
--- a/app-crypt/zuluCrypt/Manifest
+++ b/app-crypt/zuluCrypt/Manifest
@@ -1,3 +1,2 @@
-DIST zuluCrypt-4.7.7.tar.bz2 550309 SHA256 d832668c646bb93a63e908bd1896def830db304138a17f34eae09dd41b3197d4 SHA512 bca390caacc7ff39b03dce370c2f85da2f52d9de3604713ec2dec6f53b75573163a5db60ca30746f4056def8617a9a93f80026c1833396356c849b10948468f1 WHIRLPOOL 6d54015b8458cd6b4460afc33f14dabe3672bc3aea849230090b0c2a64f37da9777f1e0745e7000be1e05874962f4cc97e284fa8877fa0a1d09b93b71bb5e215
 DIST zuluCrypt-5.0.1.tar.bz2 785950 SHA256 53a970173c7f87cf3b2c4a9bf12c36fa7796147d99235cc37de9aa2cbcbddcde SHA512 69ffd13957ff36783d20caf489d35a018ef5eee4db6627789525be53dc39fe0245c16e95449de18eabef11a46480501647bdc7bd3072c92fecbcb43a7e1ec2eb WHIRLPOOL 40207e9a798676ecfc6a2959e4edb79bc770ee749844a005e15fb4227ea761e8ef29757ea1710b40248c861df69312354191e7311069eaf2f42c983d196f3e9c
 DIST zuluCrypt-5.1.0.tar.bz2 1610597 SHA256 dd57be9bcee64f7f4427f4a80e31bf8796d3ad7889f6c3bd78597ff14c1ba520 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0 WHIRLPOOL 72e202888b7c6cfc5fcc5720430c92813c7c313d04a1d31d432b942e0553450024c5a1a4e2cbb79359e4fa8276d7874a4d507721744a707745f1cf951d19510a
diff --git a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
deleted file mode 100644
index c8681ad86058..000000000000
--- a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib cmake-utils
-
-DESCRIPTION="Front end to cryptsetup"
-HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/"
-SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome +gui kde udev"
-
-CDEPEND="
-	dev-libs/libgcrypt:0
-	sys-apps/util-linux
-	sys-fs/cryptsetup
-	gnome? ( app-crypt/libsecret )
-	gui? (
-		dev-libs/libpwquality
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		kde? (
-			kde-frameworks/kdelibs:4
-			kde-apps/kwalletd:4
-		)
-	)
-"
-RDEPEND="${CDEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use udev UDEVSUPPORT)
-		-DLIB_SUFFIX="$(get_libdir)"
-		$(cmake-utils_use !gnome NOGNOME)
-		$(cmake-utils_use !gui NOGUI)
-		# WITH_PWQUALITY has no effect without gui
-		$(cmake-utils_use gui WITH_PWQUALITY)
-		# KDE has no effect without gui
-		$(usex gui "$(cmake-utils_use !kde NOKDE)" "-DNOKDE=TRUE")
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 26d5173b87fa..5ddb47754e32 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1 +1,2 @@
 DIST free42-1.5.12.tgz 22691715 SHA256 77f053fbfc597229f4e7d4e66d80aad0252e18bd8c3e05c757c02af5c4cdf268 SHA512 85e595f14e1ee5cf498dc9aa641edb841db450dbeca67b4a5c7853e7c2d655e3d40ca9332d0fed70c3a3e397553bc4655f87a27aefca4c0eb89d16a6fafae843 WHIRLPOOL 5c0d762660d239c6157a18bbd353734d4af9afb5d665cc75c200e92509457b898693540732be05afeb0514c5c2604207a97c0adbb22121789170de94f538de84
+DIST free42-1.5.13.tgz 22684310 SHA256 27caa84aa77257290ae27dfe04236bbf75126b197067a9c1cf7723cccbe65fd9 SHA512 b12b5be7a7d8241cb38046bef163143e71d9910c829179509daa00c47077a12c9b506bb0203bad1202e0200ae3a73cf4171d1dedd401c28fd18f1129199c4c1e WHIRLPOOL 588ea795af49fc235b4250f5f648930cb09b048cb7d44182c72622b285b76110816a20228d96ab94ee3b2bb8d55690d24d136e1524cb24630866161202d7373f
diff --git a/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch
new file mode 100644
index 000000000000..23641b552f27
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.13-fix-build-intel-lib.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
+--- a/gtk/build-intel-lib.sh	2016-09-04 18:56:12.000000000 +0200
++++ b/gtk/build-intel-lib.sh	2016-09-24 19:39:49.284126118 +0200
+@@ -4,7 +4,7 @@
+ cd IntelRDFPMathLib20U1
+ patch -p0 <../intel-lib-linux.patch
+ cd LIBRARY
+-make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
++make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
+ mv libbid.a ../../gcc111libbid.a
+ cd ../..
+ ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
diff --git a/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
new file mode 100644
index 000000000000..bc7cf3f1c8c7
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.13-fix-makefile.patch
@@ -0,0 +1,58 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile	2017-01-22 22:03:38.000000000 +0100
++++ b/gtk/Makefile	2017-02-02 15:08:32.589997985 +0100
+@@ -15,11 +15,11 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+ 	 -Wall \
+ 	 -Wno-parentheses \
+ 	 -Wno-write-strings \
+-	 -g \
++	 -Wno-error=narrowing \
+ 	 -I/usr/X11R6/include \
+ 	 $(shell pkg-config --cflags gtk+-2.0) \
+ 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
+@@ -27,21 +27,25 @@
+ 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
+ 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++	 ${CFLAGS}
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+ 	 -fno-exceptions \
+ 	 -fno-rtti \
+-	 -D_WCHAR_T_DEFINED
++	 -D_WCHAR_T_DEFINED \
++	 ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++MYLDFLAGS = -L/usr/X11R6/lib
++LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
+ 
+ ifeq "$(shell uname -s)" "Linux"
+-LDFLAGS += -Wl,--hash-style=both
++MYLDFLAGS += -Wl,--hash-style=both
+ LIBS += -lpthread
+ endif
+ 
++MYLDFLAGS += ${LDFLAGS}
++
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+ 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
+ 	core_commands3.cc core_commands4.cc core_commands5.cc \
+@@ -83,7 +87,7 @@
+ endif
+ 
+ $(EXE): $(OBJS)
+-	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
++	$(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
+ 
+ $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
+ 
diff --git a/app-emulation/free42/free42-1.5.13.ebuild b/app-emulation/free42/free42-1.5.13.ebuild
new file mode 100644
index 000000000000..6e7ef59c438e
--- /dev/null
+++ b/app-emulation/free42/free42-1.5.13.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
+		"${S}/gtk/shell_main.cc" || die
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
+}
+
+src_install() {
+	dodoc CREDITS HISTORY README TODO
+	dobin gtk/free42dec
+}
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 88c1e63f260a..6af06ad64583 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,2 +1 @@
-DIST zisofs-tools-1.0.6.tar.bz2 53138 SHA256 a7d80141be2b52df99423cc617ad9dab8e81b1c79ca437789bbb1a9433524e3e SHA512 7928c40bd421853adde1da874a574ccaaa2b9ac3cb6d0fe241763bb64f66717dd83991f92bad093a1044e35f72f84643568af4a4999cfe62b85777df24fc0b96 WHIRLPOOL eb3a0ed0394bba3a2dc4f51aba0a2071b4f69db997f46f577550afbe296dbbede564641cc29d5b8d032ab8e1cc9ea90abbc3f43aa33984d564def8aadfd3eddf
 DIST zisofs-tools-1.0.8.tar.bz2 52968 SHA256 ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3 SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d WHIRLPOOL 05b59ba8423be7ac1f257ce6106f32be00cc62ffd2891c8f620e65b5eda28611aefd073f3832088bfcb42309d92e0b8866ed219b273b9d9431af928e032a061f
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.6.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.6.ebuild
deleted file mode 100644
index 4108befdb098..000000000000
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic
-
-DESCRIPTION="User utilities for zisofs"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/zisofs/"
-SRC_URI="mirror://kernel/linux/utils/fs/zisofs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static"
-
-DEPEND=">=sys-libs/zlib-1.1.4"
-
-src_compile() {
-	use static && append-ldflags -static
-	econf || die
-	emake || die
-}
-
-src_install() {
-	emake INSTALLROOT="${D}" install || die
-	dodoc CHANGES INSTALL README
-}
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index ec03c078b906..e1eaa6f9d36c 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1 +1,2 @@
 DIST yodl-3.08.01.tar.gz 283634 SHA256 958497939d9f3d1c6d0e2e74f7592d5a98f9ddb6f95c50c1247e41600d2765b7 SHA512 a88ab79657661262f4ccce4fd307ba41a05bcefbb534a2b5ed84115ab592ddf3ce883747aad5c028e73142ec91815ee86e1ae16ab9d319fe2045a2b0a08ab42c WHIRLPOOL aa9d9c0d58da0d5dbda3acd4f4f5fe5867873a23fd0f133404a6be9965001c1326714fc05296fa2a91912fe011391dd51819a40d2ddecfd7d99cfd8ac833339d
+DIST yodl-3.08.02.tar.gz 283890 SHA256 19264d7a1ed00edaa896e41b5aeacb722a4ca79dd6958731229f1bd1d1dd91bc SHA512 adad9f6235288f0ae6990c0dbba3cd7c8461172ae83231ca8fa113275d04ad20d3722e70f6f0ffcf072a19b4816e556b9b09227123516fc4a0170bc053b48b8e WHIRLPOOL ed3b5e0cc141f6b0c84191791f86af361cddf1753c2080eb8bc7f43e0eae78d329fd00b16a98bb14f1f2d93d91aab9b3a7947e7e065fcf2b4706fbfde5d9f868
diff --git a/app-text/yodl/yodl-3.08.02.ebuild b/app-text/yodl/yodl-3.08.02.ebuild
new file mode 100644
index 000000000000..f787158b0807
--- /dev/null
+++ b/app-text/yodl/yodl-3.08.02.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
+SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-util/icmake-8.00.00"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
+		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
+		-e "/CXX =/s/g++/$(tc-getCXX)/" \
+		-i INSTALL.im || die
+
+	sed -e "s/ar r /$(tc-getAR) r /" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+
+	default
+}
+
+src_compile() {
+	./build programs || die
+	./build macros || die
+	./build man || die
+	use doc && { ./build manual || die ; }
+}
+
+src_install() {
+	./build install programs "${ED}" || die
+	./build install macros "${ED}" || die
+	./build install man "${ED}" || die
+	./build install docs "${ED}" || die
+	use doc && { ./build install manual "${ED}" || die ; }
+}
diff --git a/app-vim/vim-rest-console/Manifest b/app-vim/vim-rest-console/Manifest
index 751ea484545e..d2b18496322b 100644
--- a/app-vim/vim-rest-console/Manifest
+++ b/app-vim/vim-rest-console/Manifest
@@ -1,3 +1,4 @@
 DIST vim-rest-console-2.3.0.tar.gz 11584 SHA256 e3d07527a41f03eeffc82f12e1de43865f36f7348e4bf99fc4e2af55b234a74a SHA512 04fa4cc2177b87a6d69ad50d0e45f411169d178e4990280afde730c461cb718acd09dc034e61c51f73974369d9be9300281f1e60adf8084730977caa27c65da2 WHIRLPOOL 93b5bc602361a2abe845a688b0e8c22cc7c3e3d6dd671f37e8d576f9d3c06ebaea3da58ac2838634a7219dd6fe1a56cc666d3a076e799bad1cae2636996371e9
 DIST vim-rest-console-2.4.0.tar.gz 11795 SHA256 011e1166f9e8f5831a0288640952d962ab9190cb02c54b8947354049d7146028 SHA512 77f06a9cee534eda2e414c4b0b0fdbdf335b1a397ab9c45b4331f211db1dbeb89bd0a73906945b0ed08c8b795c4be444b9ffcd2c06e145a43b3efb456aa64666 WHIRLPOOL 1b44987d3645a6d16243006f428c66b3d9f980a358865aab644631a5650a330ed38e266ac9d0c2084a3f1d9a10490202be6a45a2af2455e40558e66826643dee
 DIST vim-rest-console-2.5.0.tar.gz 11945 SHA256 8457eb0896e34a6b664c5dccec688d8a5fbca9591ab08c8b2173c578d1ea7f72 SHA512 1c2e2dafdcdd57216bac08adfaef4e5f3dc2331b13fd969064bd460681838cb4eb830644e33e9397388b0ff76b68d992523ba1c258c2385d6daae5ad87cbdd58 WHIRLPOOL 45337e977bef174df92bf36a0c6f08dc0f3930e8b20a32e6ebebca0fe5f8439ba17c0bf65a79dc4a828a049b934de1ef81a03fc4c03813adb84b4d8694988a98
+DIST vim-rest-console-2.6.0.tar.gz 15935 SHA256 55f80fe583393e0af39e44f540de58a46c0a1d7a8a87e357f00693121f3fd90c SHA512 d75b9071eed1bdae604c3fc3457c319a8893ba01001c6b27b8bbea038e9964597bb1a7a2e03ac1d6d9e35e9d96ee350f1eaf6c12f2e8f53929f3f511a470170d WHIRLPOOL c3a62b3178714b940b24443bbeb1a5bb8ab63b08c9327d19362de4f160273db243dbb2618835155204b7f3c2a58efc53bb65a91955f78c27b04f030570b7feb1
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
new file mode 100644
index 000000000000..aa4a6fcfd983
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+	rm *.md *.json *.rest || die
+	default
+}
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index c827379cd623..c07f36c1f7dd 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -3,5 +3,6 @@ DIST swig-2.0.12.tar.gz 5312394 SHA256 65e13f22a60cecd7279c59882ff8ebe1ffe34078e
 DIST swig-2.0.9.tar.gz 5307341 SHA256 586954000d297fafd7e91d1ad31089cc7e249f658889d11a44605d3662569539 SHA512 9967eb2e1733c11ceb813bfa18c8c4187ba527d45de9b2ad962f287afba9cb0e1432b921670c5fe07ed31decc2e2785a16f42f69148a4e8a1959a9b66ce2e91f WHIRLPOOL 6649934f33d36b7bf9314a7f6582245217795b6e9c36eb02436ed769f8fb06a3a038af2380f444a1311aa353d3f29c4a3159765f873d09ed90980998e0752e81
 DIST swig-3.0.10.tar.gz 8029827 SHA256 2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c SHA512 599883a08b673cb0975176084fa7a6f5c7e3f6ffa86e8ba600e9d81d80b9d7632668e61c8db519b4c800bdbddcdbf55b0f5ef49f6a80ceafaef864ffcaaa30c1 WHIRLPOOL bcdbc754d32c45e202cd55a73e7584240e3f073ec21116db88325558374d5477803d83308f467a469e50b8dcbc4fa2a5d5146d6d73fbd7d3abc0e879766b2b73
 DIST swig-3.0.11.tar.gz 8141827 SHA256 d9031d531d7418829a54d0d51c4ed9007016b213657ec70be44031951810566e SHA512 36771bd29fcec159d283f0f8d056937c6c913fec717f1f3b97a9b17fa27a8a85aa5f7b79bec3c46d70b625c36c26e9e856a4750cbd0872070ca18e9174842a52 WHIRLPOOL 49fac0b8ff0786671b2eb0d7c9955054ec2b17be07d1ce5c2ca063022d89c56e3598c3ce5133eac92eee4286f7ecfc52da6003993cd1bf6a7704162344ca31bd
+DIST swig-3.0.12.tar.gz 8149820 SHA256 7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d SHA512 5eaa2e06d8e4197fd02194051db1e518325dbb074a4c55a91099ad9c55193874f577764afc9029409a41bd520a95154095f26e33ef5add5c102bb2c1d98d33eb WHIRLPOOL 468d710807ca5052bb2dc0e9551cf4f7a41bddfa380b8ee30b175c99aa5656e71270dd900b4dda545b39fa22bd102623dde292b22a63d5c5fbe1521ed7bb30ee
 DIST swig-3.0.5.tar.gz 5873209 SHA256 9f4cb9e8f213f041853646f58fe5e8428d63250d05f5c943b6fa759c77322a3c SHA512 1cd9eaea1443d08ac0f9a80f9cb3d60121e888e30c9f00aaaf285d6afe8a5494a3be017a38092b879d332305911c177202cfccd2570cb61eb40554fcc573fd01 WHIRLPOOL 49dc145dbd24bbe0dd9d5baa82ab8e1b79b0cec14035038d22fd506010ce5185731876a157c811d2087f35360ce04aafed8c7beff7f7feaf246f964891395ea9
 DIST swig-3.0.8.tar.gz 7937213 SHA256 58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453 SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906 WHIRLPOOL 7b6e5b0339b5fd42992464ca16935d1e8447d46c2e561579eb99dda90755bc3ca88baeff8bb0c0dffe91b109dd9af0465a360fec2fd871bd5bfaef278229bbf9
diff --git a/dev-lang/swig/swig-3.0.12.ebuild b/dev-lang/swig/swig-3.0.12.ebuild
new file mode 100644
index 000000000000..f532a77d8f8f
--- /dev/null
+++ b/dev-lang/swig/swig-3.0.12.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Simplified Wrapper and Interface Generator"
+HOMEPAGE="http://www.swig.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ BSD BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ccache doc pcre"
+RESTRICT="test"
+
+DEPEND="pcre? ( dev-libs/libpcre )
+	ccache? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
+
+src_configure() {
+	econf \
+		$(use_enable ccache) \
+		$(use_with pcre)
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		docinto html
+		dodoc -r Doc/{Devel,Manual}
+	fi
+}
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 6e66ac645079..27f8d7c83594 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,3 +1,3 @@
 DIST libevent-2.0.22-stable.tar.gz 854987 SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 SHA512 990637f12e890bfa7f86c194c8b112701436e92b60afb829194879efb85d558b986261e6508fe29bde73981feada874438e2d442cec8ea5730c889954f9bc907 WHIRLPOOL fe465e94a35dc489a86fad93fd4a82d5c314e3a66ebf1bcf8ba29014fe9bd2ebce4546b4a6a9fedee40d17010d73eb89b99596cec1dde3b7f9a4240cf6b6760d
-DIST libevent-2.1.5-beta.tar.gz 972344 SHA256 79e1b82236a02f1432b6d95ef94186915790eb9910211647f9c01a85149066d8 SHA512 cc38885fc9c7f884085d6adb4bfa51834935475f9c24b76e1fe301b43520dd88935aea588eb4c5795942fa625a790ff575f06b709775e8424691f3307becd216 WHIRLPOOL a040e9b63933d422a7ffa75c4dd0649ae239ebd747fb733420df9f40eb48e9d6ff4d4e6f217b87655a1cbde53cba1ef03beed107d62bf8720391c1f05e010adb
 DIST libevent-2.1.7_rc.tar.gz 696447 SHA256 548362d202e22fe24d4c3fad38287b4f6d683e6c21503341373b89785fa6f991 SHA512 72187614ddd5ce0ef0560d54e526ca9986dde90d4c1542637217ce62a596d800dedda88e4da383529ebf961c198929da59a2b570b1a19dba9d2506684af8cb3a WHIRLPOOL 5e7e71c22729b068890aacc1e157680489662078c509a1be7689f21707d1b4d40538f97debb6e93df0393fbaa309d3c81f900bebddd2a352782299ff441e2efc
+DIST libevent-2.1.8.tar.gz 1026485 SHA256 965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 WHIRLPOOL ac90b6613619e0acf039fa331769449b29a3b7698a6d51b811c9288a550a3178e07b5a18a0982141ee90b7e1c34afdc80658355135963ef487cd243c472ee79a
diff --git a/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch b/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
deleted file mode 100644
index 27578b15248c..000000000000
--- a/dev-libs/libevent/files/libevent-2.1.5-event_signals_ordering.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/event.c
-+++ b/event.c
-@@ -926,13 +926,13 @@ event_reinit(struct event_base *base)
- 		event_del_nolock_(&base->sig.ev_signal, EVENT_DEL_AUTOBLOCK);
- 		event_debug_unassign(&base->sig.ev_signal);
- 		memset(&base->sig.ev_signal, 0, sizeof(base->sig.ev_signal));
--		if (base->sig.ev_signal_pair[0] != -1)
--			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
--		if (base->sig.ev_signal_pair[1] != -1)
--			EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
- 		had_signal_added = 1;
- 		base->sig.ev_signal_added = 0;
- 	}
-+    if (base->sig.ev_signal_pair[0] != -1)
-+        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
-+    if (base->sig.ev_signal_pair[1] != -1)
-+        EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
- 	if (base->th_notify_fn != NULL) {
- 		was_notifiable = 1;
- 		base->th_notify_fn = NULL;
-@@ -981,8 +981,12 @@ event_reinit(struct event_base *base)
- 		if (evmap_reinit_(base) < 0)
- 			res = -1;
- 	} else {
--		if (had_signal_added)
- 			res = evsig_init_(base);
-+			if (res == 0 && had_signal_added) {
-+				res = event_add_nolock_(&base->sig.ev_signal, NULL, 0);
-+				if (res == 0)
-+					base->sig.ev_signal_added = 1;
-+			}
- 	}
- 
- 	/* If we were notifiable before, and nothing just exploded, become
diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
similarity index 81%
rename from dev-libs/libevent/libevent-2.1.5-r4.ebuild
rename to dev-libs/libevent/libevent-2.1.8.ebuild
index f3b169a1830f..ca87a245997e 100644
--- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -2,18 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils libtool multilib-minimal
-
-MY_P="${P}-beta"
+EAPI=6
+inherit autotools eutils multilib-minimal
 
 DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://libevent.org/"
-SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
+HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-# libevent-2.1.so.5
-SLOT="0/2.1-5"
+# libevent-2.1.so.6
+SLOT="0/2.1-6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 
@@ -32,11 +30,11 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/event2/event-config.h
 )
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P}-stable
 
 src_prepare() {
-	elibtoolize
-	epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
+	default
+	eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/dev-ml/llvm-ocaml/files/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch b/dev-ml/llvm-ocaml/files/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
deleted file mode 100644
index 8a2c091edfbf..000000000000
--- a/dev-ml/llvm-ocaml/files/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a2ecd4815d285281cb816e06b25dc0dc2a933073 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 21 Aug 2016 23:13:45 +0200
-Subject: [PATCH 06/10] cmake: Remove the CMAKE_BUILD_TYPE assertion
-
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 894bc8c..453fcb8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -232,11 +232,6 @@ endif()
- 
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- 
--if (CMAKE_BUILD_TYPE AND
--    NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--  message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--endif()
--
- set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
- 
- set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
--- 
-2.9.3
-
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild
index d9e815d4bef0..e984d5714028 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild
@@ -58,9 +58,6 @@ src_prepare() {
 	# Python is needed to run tests using lit
 	python_setup
 
-	# Allow custom cmake build types (like 'Gentoo')
-	eapply "${FILESDIR}"/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
-
 	# User patches
 	eapply_user
 }
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
index 41c9948de53c..49f090910a24 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild
@@ -57,9 +57,6 @@ src_prepare() {
 	# Python is needed to run tests using lit
 	python_setup
 
-	# Allow custom cmake build types (like 'Gentoo')
-	eapply "${FILESDIR}"/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
-
 	# User patches
 	eapply_user
 }
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.ebuild
deleted file mode 100644
index ea4c16027e5c..000000000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.30
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-IO
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest
index d27ced6f6041..359c5b9eb15b 100644
--- a/dev-perl/Capture-Tiny/Manifest
+++ b/dev-perl/Capture-Tiny/Manifest
@@ -1,3 +1,2 @@
-DIST Capture-Tiny-0.30.tar.gz 34578 SHA256 a3b4e55278757e77d50df0b1a79f42e6e8354b7d41db806da39bf161bee63aea SHA512 c85b3d1eec69cbee68fc529a439b2e26076beae4b92001805fd0984e27a69c09a2cdecd9409797f77395ef3804934e20e0a78bbac2af83753c2e8d71b971fbac WHIRLPOOL 4a8a5a3537250306fd08b21096db7753c5610429c9dfd183e6b7916a7f83636fe03ce7f034c278d07961e8b709ab625812acb7a8524929430c7895927dcf35c5
 DIST Capture-Tiny-0.36.tar.gz 36318 SHA256 ab8742e53ad204a421bc82d5813f3c4c85c76581ea10d910d0aefc161f8cb03d SHA512 5897fc20d2189dab7c4eef56d1f7c2b617ed868430f5d63c9a87ea547c04177e1543b74f1eb0c3529135f40ee5488adbf1fef4856177a994a3ae6302771646ef WHIRLPOOL 0b377bcbb938a754352796f876b96fea7e3d5848c583c1e9a8f0aceb381c9651c3e12dc10d1315b327eef4ed19bf52db4a614a512488661f3df7b415341816b4
 DIST Capture-Tiny-0.42.tar.gz 36671 SHA256 b326c918bb0923c02133e78bcfa490d1cfd5f82677b8c4cfca0577c24edf3fa6 SHA512 a5e0baa2c0ab0b6be59f287b47f8533c53b9b455b68dc974cfb57868b176ffe7e210696831c114f2f06908876d0caa9b6502922bf3c92df49113b8448ec48565 WHIRLPOOL 04d5673b332630c613c80dbb8f70a9c320815c9f30a1bda915f629091615f13561e54aa406198c649ac8e49d9a8be495622cd92e6db81e3020a5cae5df9e3db3
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index 467238064f74..0523d3135484 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -2,3 +2,4 @@ DIST PySocks-1.5.6.tar.gz 9189 SHA256 a62b35b13968ba3642a973d115ae6a11be886b5f5a
 DIST PySocks-1.5.7.tar.gz 32480 SHA256 e51c7694b10288e6fd9a28e15c0bcce9aca0327e7b32ebcd9af05fcd56f38b88 SHA512 adcb504b938dacb3c5bd5bd28a9f2cd8311bb188dea1a1b65de13ef0b2b00af498a0e44280fff1ceaca4fed95281c070a13866cf13ee898cb564b4ef215ac4a4 WHIRLPOOL 57c9ebc6577b6fdcf883fed8cc5957330eb6848ec7c1bf164a34829832e17492bb9df433bacd9852ea4003d509c19108d5b540db918cf30322e2511fc567b336
 DIST PySocks-1.6.4.tar.gz 17172 SHA256 07f25f0720983462d5992c44a8288b54261e0055317535fbd8d96fe0c391817e SHA512 54992bb489ea8b559a3a844da1bd0a2b772ab84361f9f466e5b7cc8bc566ae9a01e8c9c0cc6ce914fb63b24d822aab8842cf10ad51d4c6233a5433d4a353b335 WHIRLPOOL 0f5d0255df3a1fa8a330f87fea0d546fc0b6d2554a9f5061dad349e5029ed4f1d4608860433bc353df07632467a298474cdf2418839b68d59376ec22a3c91176
 DIST PySocks-1.6.5.tar.gz 17212 SHA256 7962f4d7c76e8414ae168c677a77f19cf8926143911f7e8d37a5d4c4eb910c6f SHA512 19f0822afba1635d68cce327e1cd13203e3a2c39f92ae3817759de22ce3154899b97abe4760a3f0315b6af7757e116c8f7717b7948de179b16c065f743c845e2 WHIRLPOOL dea78f04e04006b691ad7f31af593076489c929fffeb5d6d631bfd69dd8e848936bb006eac1e32655bcbc84ec7ef18036d26716011552865abe279ae5b56ea9d
+DIST PySocks-1.6.6.tar.gz 282014 SHA256 02419a225ff5dcfc3c9695ef8fc9b4d8cc99658e650c6d4718d4c8f451e63f41 SHA512 f2989cb006cf804b713b29b7a317c54fff3ee4ed4b3dec81630f10e7bd26d41b2fe10058f3fcbf2ffff9888a3f7c0bd718e268dfd79e096c93a3bae355649f79 WHIRLPOOL 36db6d0335fc5ac96fece0d9bff282ea927304642155c93819be1d63fa46b638f9ec7a7bb67a1305c1a1560f82c7da9f0606ecd3a7214dd2f3bb20cd5935daf2
diff --git a/dev-python/PySocks/PySocks-1.6.6.ebuild b/dev-python/PySocks/PySocks-1.6.6.ebuild
new file mode 100644
index 000000000000..ff620ac19649
--- /dev/null
+++ b/dev-python/PySocks/PySocks-1.6.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS client module"
+HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
index c70546d2ba1f..3852a7161f9f 100644
--- a/dev-python/beaker/beaker-1.6.4-r1.ebuild
+++ b/dev-python/beaker/beaker-1.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 # webtest-based tests are skipped when webtest is not installed
diff --git a/dev-python/beaker/beaker-1.7.0-r1.ebuild b/dev-python/beaker/beaker-1.7.0-r1.ebuild
index 1068e17b86f4..29b793a4f347 100644
--- a/dev-python/beaker/beaker-1.7.0-r1.ebuild
+++ b/dev-python/beaker/beaker-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bbangert/${PN}/archive/v1.7.0dev.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 # webtest-based tests are skipped when webtest is not installed
diff --git a/dev-python/beaker/beaker-1.8.0.ebuild b/dev-python/beaker/beaker-1.8.0.ebuild
index d3220132f6eb..fa8ce49b2a9a 100644
--- a/dev-python/beaker/beaker-1.8.0.ebuild
+++ b/dev-python/beaker/beaker-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # webtest-based tests are skipped when webtest is not installed
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
index 54c404051063..1832a544fb68 100644
--- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/SimonSapin/cairocffi"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
index e1840d256bab..81c491717b4a 100644
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
 
 REQUIRED_USE="
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index 6f9c1aafe8ad..0525040e7aa4 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
index 0c6d73d0524e..6934120f6b8a 100644
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
diff --git a/dev-python/matplotlib/matplotlib-1.5.1.ebuild b/dev-python/matplotlib/matplotlib-1.5.1.ebuild
index a7f392d8663e..e59911637b2e 100644
--- a/dev-python/matplotlib/matplotlib-1.5.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
diff --git a/dev-python/matplotlib/matplotlib-1.5.3.ebuild b/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild
similarity index 96%
rename from dev-python/matplotlib/matplotlib-1.5.3.ebuild
rename to dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild
index c97bd9003fdc..88198059ee67 100644
--- a/dev-python/matplotlib/matplotlib-1.5.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
@@ -46,12 +46,7 @@ COMMON_DEPEND="
 	media-libs/freetype:2
 	media-libs/libpng:0
 	media-libs/qhull
-	cairo? (
-		|| (
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			dev-python/cairocffi[${PYTHON_USEDEP}]
-			)
-		)
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
 	gtk2? (
 		dev-libs/glib:2=
 		x11-libs/gdk-pixbuf
diff --git a/dev-python/mpmath/mpmath-0.18.ebuild b/dev-python/mpmath/mpmath-0.18.ebuild
index b5fd3db1678e..40e0cc6e0d4b 100644
--- a/dev-python/mpmath/mpmath-0.18.ebuild
+++ b/dev-python/mpmath/mpmath-0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/m/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="doc examples gmp matplotlib test"
 
diff --git a/dev-python/mpmath/mpmath-0.19-r1.ebuild b/dev-python/mpmath/mpmath-0.19-r1.ebuild
index 509009e57801..1aed6ef6bb40 100644
--- a/dev-python/mpmath/mpmath-0.19-r1.ebuild
+++ b/dev-python/mpmath/mpmath-0.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="http://mpmath.org/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="doc examples gmp matplotlib test"
 
diff --git a/dev-python/mpmath/mpmath-0.19.ebuild b/dev-python/mpmath/mpmath-0.19.ebuild
index df374dcaa5ee..748434858092 100644
--- a/dev-python/mpmath/mpmath-0.19.ebuild
+++ b/dev-python/mpmath/mpmath-0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="http://mpmath.org/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="doc examples gmp matplotlib test"
 
diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
index e908377bd011..3d3127423c27 100644
--- a/dev-python/networkx/networkx-1.10-r1.ebuild
+++ b/dev-python/networkx/networkx-1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/networkx/networkx-1.10.ebuild b/dev-python/networkx/networkx-1.10.ebuild
index 13ca586abc7b..4a35197366a6 100644
--- a/dev-python/networkx/networkx-1.10.ebuild
+++ b/dev-python/networkx/networkx-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index 23e80226cf30..105a91456be9 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/networkx/networkx-1.9.1.ebuild b/dev-python/networkx/networkx-1.9.1.ebuild
index 5f09f7ce4552..98904620527f 100644
--- a/dev-python/networkx/networkx-1.9.1.ebuild
+++ b/dev-python/networkx/networkx-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 COMMON_DEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/numpydoc/numpydoc-0.4-r1.ebuild b/dev-python/numpydoc/numpydoc-0.4-r1.ebuild
index 4f5ea45916a7..53fd72d3c691 100644
--- a/dev-python/numpydoc/numpydoc-0.4-r1.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/numpydoc/numpydoc-0.5.ebuild b/dev-python/numpydoc/numpydoc-0.5.ebuild
index 6597ffa99093..244c10b6e8ca 100644
--- a/dev-python/numpydoc/numpydoc-0.5.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/numpydoc/numpydoc-0.6.0.ebuild b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
index 9ef00d36b40e..ed5b5bd53d00 100644
--- a/dev-python/numpydoc/numpydoc-0.6.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/oct2py/oct2py-1.3.0-r1.ebuild b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
index f26e72cecc2a..02916e830ed4 100644
--- a/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
+++ b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/oct2py/oct2py-3.3.3.ebuild b/dev-python/oct2py/oct2py-3.3.3.ebuild
index f1321b117d16..c5ce2ad2c2ca 100644
--- a/dev-python/oct2py/oct2py-3.3.3.ebuild
+++ b/dev-python/oct2py/oct2py-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
index b8a4d0dc6a51..2ed10b2153d0 100644
--- a/dev-python/oct2py/oct2py-3.6.0.ebuild
+++ b/dev-python/oct2py/oct2py-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index 2ea0b6114498..01e3b5c44ce8 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1 +1,2 @@
 DIST pyformance-0.3.2.tar.gz 10726 SHA256 7004f8e6eee1bcf8e28fb2ec74c8d67894158ccc01397faae70f6ee9729f9b8a SHA512 a838bb6cac144c309d2ff7050617b300fa2308f2bbab1d8b072ce87548d2dbd9ecb2dd552f9ddd53ded2ca4020bd42c7a3f4a245bc2c68ded5f01ebaf04edd71 WHIRLPOOL 6fb45017f8ea85ce3d61346f6a489861c30bf64bd8879e5dad4cb0cab4245346348b94183447e7ca86eb674a5ea4a874c42dec768dc02a0562b009d63e287bc5
+DIST pyformance-0.3.4.tar.gz 19394 SHA256 a9294ec48b57711ad60af0badf1354c0e28364e82d2579a0d3d3afbf845547ac SHA512 5dbc83da62bf66767eaaf316824cf5683488d8ee594b72baee327c4ef594f84b5aed07654da483aff29bee98605e5265425be88c165a4bb06e7bdddbbf28e440 WHIRLPOOL 346a1b1d58b3a6be73bff33c6cb943363df2185b26ae709a665b66ab32f594eb3cc3ac7578dcd902652626187715db6fbd48960ec676404e2e2a661ce9e3dff7
diff --git a/dev-python/pyformance/pyformance-0.3.4.ebuild b/dev-python/pyformance/pyformance-0.3.4.ebuild
new file mode 100644
index 000000000000..7e2681b15f7e
--- /dev/null
+++ b/dev-python/pyformance/pyformance-0.3.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
+HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.python.org/pypi/pyformance/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
+	sed -i -e "s/URLError, err/URLError as err/" ${PN}/reporters/influx.py || die
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 5ffcc199a935..1cc5d6f19106 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1,3 @@
 DIST pylast-1.0.0.tar.gz 29099 SHA256 948bc9efb2e2785db8c303cc6559358b943538cc45f902838db770b84843d605 SHA512 1d6183596ff994f37722be493e22c65a2c441f5890b539fd9e19d515a5a38afc7017524600903879a8c76b938a52dec6ef4753c0e01dd59bae4e1596962755a0 WHIRLPOOL fd81c5143574f7685383719d76db67b24dbf78d387f3f73846ee2fc2433bf1ea65b1d35961b8f9424fb083f42872bb150e505cbfda93134fcb4509a74d8a8980
 DIST pylast-1.6.0.tar.gz 41307 SHA256 6bf325ee0fdeb35780554843cf64df99304abb98c5ce2e451c0df7e95e08b42e SHA512 2e47eca2282da8637d5fc79b8fc6784f6f7e9c88975f10e5f162be1445f81dbce0a01c6d7e8ff14162bc3b48a8a4171bf4c81239b17fb08ea5c6b1eaf432f18f WHIRLPOOL f76dbae7326c2b973c8ac1e68e4f31145e449a37d5a342f7ab551cdc737fe529bf9839b05f74d67805bd97aa66f7808a56abea6f57bf0e74390a33d59aa07179
+DIST pylast-1.7.0.tar.gz 42433 SHA256 a482a769b6a037e2e9b78433de91a287eaf6aacff60bbb2f4562c3c7ece10430 SHA512 c5f983f651b4d76a004d5521ae3a76d05dc3b424523be365679b7a35f11a5a83894e2bc18365b058b254935fa804575631eacbde4b37d1e2f3d7eb325eeabab4 WHIRLPOOL 04caefd6a7aa11dda40f270587c0a9cfe393c9262411f802a429e5ba893e7320200ba2e8942047f7d583b0e76e4f7edfc2b5671b223c98084287c7a2b255a4b9
diff --git a/dev-python/pylast/pylast-1.7.0.ebuild b/dev-python/pylast/pylast-1.7.0.ebuild
new file mode 100644
index 000000000000..28a5b2098567
--- /dev/null
+++ b/dev-python/pylast/pylast-1.7.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# As the testing requires a last.fm account and online access it is restricted
+RESTRICT="test"
diff --git a/dev-python/pyquery/pyquery-1.2.11.ebuild b/dev-python/pyquery/pyquery-1.2.11.ebuild
index 702246bd8223..49fcf245ca3b 100644
--- a/dev-python/pyquery/pyquery-1.2.11.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
index 4a69db02c0a9..21c281056537 100644
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild b/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
index 3d7e387d56a8..797520a89d82 100644
--- a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyquery/pyquery-1.2.9.ebuild b/dev-python/pyquery/pyquery-1.2.9.ebuild
index 872d49fb7258..5dd5ca8a78b8 100644
--- a/dev-python/pyquery/pyquery-1.2.9.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyzmq/pyzmq-14.4.1.ebuild b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
index ca5fd2a0438a..faef53cc471a 100644
--- a/dev-python/pyzmq/pyzmq-14.4.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples green test"
 
 # Ensures installation of gevent for test phase
diff --git a/dev-python/pyzmq/pyzmq-14.6.0.ebuild b/dev-python/pyzmq/pyzmq-14.6.0.ebuild
index ec3a5e9f9b23..5006d157e06a 100644
--- a/dev-python/pyzmq/pyzmq-14.6.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples green test"
 
 # Ensures installation of gevent for test phase
diff --git a/dev-python/pyzmq/pyzmq-14.7.0.ebuild b/dev-python/pyzmq/pyzmq-14.7.0.ebuild
index aa0682fe3f71..a770bf593435 100644
--- a/dev-python/pyzmq/pyzmq-14.7.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples green test"
 
 # Ensures installation of gevent for test phase
diff --git a/dev-python/pyzmq/pyzmq-15.0.0.ebuild b/dev-python/pyzmq/pyzmq-15.0.0.ebuild
index c04e2b76eb7e..1e3c8f64cda1 100644
--- a/dev-python/pyzmq/pyzmq-15.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-15.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
diff --git a/dev-python/pyzmq/pyzmq-15.1.0.ebuild b/dev-python/pyzmq/pyzmq-15.1.0.ebuild
index c04e2b76eb7e..1e3c8f64cda1 100644
--- a/dev-python/pyzmq/pyzmq-15.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
diff --git a/dev-python/pyzmq/pyzmq-15.2.0.ebuild b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
index 93ced030f233..52e854dd6976 100644
--- a/dev-python/pyzmq/pyzmq-15.2.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 9c1c0383f0f9..2126b0d86b8f 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm ppc64 ~s390 ~sh x86"
 IUSE="+cli doc examples test"
 
 PY27_USEDEP="$(python_gen_usedep python2_7)"
diff --git a/dev-python/robotframework/Manifest b/dev-python/robotframework/Manifest
index 0589b0d2aff4..e9daf5f754af 100644
--- a/dev-python/robotframework/Manifest
+++ b/dev-python/robotframework/Manifest
@@ -1,2 +1,3 @@
 DIST robotframework-2.9.tar.gz 420364 SHA256 13a0340864e8c7735302ce39f8d3f9d01bed7db7c055e55043396242a615d8f1 SHA512 10068012da1e1fc5409dfa199f6a37c61e71e01bad5e880729704c77007d9ad4f4369476f2df7a908132fa1774a2ce3716a7de3448fb176aabe50377935f6f35 WHIRLPOOL c0adda94e4d576807bf33cc999b02b08f083a6d817869e540adc84e3722ab30e52aa73d22079c5b22ba16845bace6f96995542fdeebef679c754bd5723bd55a3
+DIST robotframework-3.0.1.tar.gz 438420 SHA256 7a497ed4094716c84ce24b63e78b5af47f3a4da8f4de978e3525e7a877d0bdd4 SHA512 9e09c1cde7b8d61b75803b12f296372045759bc5c042ef3ffdafac50d7ba0afce82111a3f7c4fad6919db4885e278e4596bfe77f87b0bb2490ce2129e574084a WHIRLPOOL f6649d25b51241f5a2aae7211f6f5a10dd53080771b18d55b69212934b83ae7e3cb65962174be5fd5f9ddb825d7aa93b847f585d789942a1b3fe5fc8c1faec26
 DIST robotframework-3.0.tar.gz 430381 SHA256 cd16f5f83031b8a754ca0a7523ce10b5046a17f3b9422626804ec05b7c501c87 SHA512 39fcd2f167bde3db9a6b9a09d87f426e0b69b6f733f17de60b46c1cf9a1b8631dc26616804a19ed5ded6d617426720697f4f2f01f4bf69aee0a94b1bb1915b9a WHIRLPOOL c84bb19ebd9e2c06a464f6fc01b74ccc87e98f6acae28b7657a82eb1c3841bce511699c2d9b4a39c6722c145adda1d2bd748f3c371483547fb329a633b165996
diff --git a/dev-python/robotframework/robotframework-3.0.1.ebuild b/dev-python/robotframework/robotframework-3.0.1.ebuild
new file mode 100644
index 000000000000..5fe45be83cc7
--- /dev/null
+++ b/dev-python/robotframework/robotframework-3.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# py2 only
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Test automation framework for acceptance testing & test-driven development"
+HOMEPAGE="http://robotframework.org/ https://pypi.python.org/pypi/robotframework/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/webtest/webtest-1.4.3-r1.ebuild b/dev-python/webtest/webtest-1.4.3-r1.ebuild
index dc691c607583..32bd2e555b0d 100644
--- a/dev-python/webtest/webtest-1.4.3-r1.ebuild
+++ b/dev-python/webtest/webtest-1.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/webtest/webtest-2.0.16.ebuild b/dev-python/webtest/webtest-2.0.16.ebuild
index 129528b57f92..952ac2e58f52 100644
--- a/dev-python/webtest/webtest-2.0.16.ebuild
+++ b/dev-python/webtest/webtest-2.0.16.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 
 #nose<1.3.0
diff --git a/dev-python/webtest/webtest-2.0.17.ebuild b/dev-python/webtest/webtest-2.0.17.ebuild
index a77bc49b4013..40da727b45b4 100644
--- a/dev-python/webtest/webtest-2.0.17.ebuild
+++ b/dev-python/webtest/webtest-2.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
diff --git a/dev-python/webtest/webtest-2.0.18.ebuild b/dev-python/webtest/webtest-2.0.18.ebuild
index 4b401078e95a..c316ca65dff1 100644
--- a/dev-python/webtest/webtest-2.0.18.ebuild
+++ b/dev-python/webtest/webtest-2.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
 
 # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index 81b30b5432b4..a82aa0abab64 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 
 # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 94063d65fbbf..111830abd9d6 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,6 +1,4 @@
 DIST Werkzeug-0.10.4.tar.gz 1137282 SHA256 9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d SHA512 d1285521f144a569f86e8f4089fe8001f60dd4ffd87856f761338be81bc328adc5eca5bb7cd06b4f9c96e6e46dc1a283198f37a70033ca78183915c3da2c4f47 WHIRLPOOL c3f3a21550e26407db28470cf539c8060c01359724613993b387f0a54435dcefc14cfbf7e4b12839e8f9b3a1421e34183f20d2d1e36a4106544ac76cd2ac22b1
-DIST Werkzeug-0.11.10.tar.gz 1155484 SHA256 cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee SHA512 4f5e108ffc6c5a822648efecacae4f10aef9d66e8bef935e5c8b72294637ed23291d33bfeb705d3b47801708c17abf2914465f910d8f13eed45d4eea0e3ca2d3 WHIRLPOOL 662c1dd76fba846d6e737cae2294524ae6afa89eae3dc5782744bec054e003876b993f484839d0a301bd40f19afb0696d70d8645652b769f1401266760c4f759
 DIST Werkzeug-0.11.11.tar.gz 1158304 SHA256 e72c46bc14405cba7a26bd2ce28df734471bc9016bc8b4cb69466c2c14c2f7e5 SHA512 b5eff55518900043840cd89238fd40873a74e762adb6d8717d5285a173725b92284ab992d753096c388a25db50bf089b91883cabc6210b6bbd7dc347ecb95027 WHIRLPOOL dacc6ae967e31688a2080e8fbc45bbb8b1cc5639008376de1e4efcf57ac82ad986109298405f647dac16b97ec0a529c5e9a9dbaf88a3273c3b60516a4de213d6
-DIST Werkzeug-0.11.8.tar.gz 1154973 SHA256 729730a25f43a29ac6a79f08384ea18a3a125d07079492e15c3b3c2a3f090c37 SHA512 da05afb481bd8e7fc71dc25ca6fd2cf7ea39d5afc43c57e7bb3e5d61d34b6dd251137ba596bbb80c702426b09a76141c6b8220087ce768cd45f827e29f8ac593 WHIRLPOOL bfec98a8b6081b2d0fcaa5fcb0af675d51a30389abdf80a0980d18380aaa0a40e2a3da5028b0341aea64ed1ba41aaa96b57a2b7a50b0b7fe2b3df2e541aaf9f8
-DIST Werkzeug-0.11.9.tar.gz 1157394 SHA256 837b71338794634c24713a79c3b9c287301433f2d18cd0adefcbcf885e60c8a1 SHA512 be2c2f6a6f1ef37d49e8724749a621d63bb7d8e9aaf56b1c4fae3ae4829fd0e6c8e799255d6e27930d4b001d9d7a011f503db9ffb05a72c1bfc3216fd254333b WHIRLPOOL d5b6bf90af272a0f8245ba8e0a0e0a936eebe1eec513c789600954e6f0c21f4d1fd531217b45a253e83ee3b4bf485c4abc7d69de454309c9b672bdfeb0c0ede3
+DIST Werkzeug-0.11.15.tar.gz 1156471 SHA256 455d7798ac263266dbd38d4841f7534dd35ca9c3da4a8df303f8488f38f3bcc0 SHA512 f66303a4a65e50e3e7661330af57172ef390ddc64268ea85a33d48dfb1e72dfc3b50a01be2088704ea3d1a45cd162eda3810841ac4dd7fb4519a82718298eaa6 WHIRLPOOL d9f259d9fa732873522a7de3177b11cbf85cd0520c316c3c32227d6bfdba6b8db7683d6f188637021d278c227c41b89dd49a516db2ff0ce35fb5934fd2e1059b
 DIST Werkzeug-0.9.6.tar.gz 1128428 SHA256 7f11e7e2e73eb22677cac1b11113eb6106f66cedef13d140e83cf6563c90b79c SHA512 0b36df25d5f69a0353f7a9321b9197ace2926b6d8e983a91ef372c270ff51462f7d86184447a5f74b4ad05ffdc6411098f77b45a4f1c906dd525d7edf220399c WHIRLPOOL db153036e9dc36c70239001a6b451adeaafa3819f4903bb8c297bb4313c9a064926a2aad6e4457810b53796b3e492228a9ee1ec165fe5dce0522ab0d2c7407f9
diff --git a/dev-python/werkzeug/werkzeug-0.11.10.ebuild b/dev-python/werkzeug/werkzeug-0.11.10.ebuild
deleted file mode 100644
index 66d07f70784f..000000000000
--- a/dev-python/werkzeug/werkzeug-0.11.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/werkzeug/werkzeug-0.11.9.ebuild b/dev-python/werkzeug/werkzeug-0.11.15.ebuild
similarity index 92%
rename from dev-python/werkzeug/werkzeug-0.11.9.ebuild
rename to dev-python/werkzeug/werkzeug-0.11.15.ebuild
index 66d07f70784f..9f9dd160bb04 100644
--- a/dev-python/werkzeug/werkzeug-0.11.9.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.11.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 	)"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 python_test() {
 	esetup.py test
diff --git a/dev-python/werkzeug/werkzeug-0.11.8.ebuild b/dev-python/werkzeug/werkzeug-0.11.8.ebuild
deleted file mode 100644
index 66d07f70784f..000000000000
--- a/dev-python/werkzeug/werkzeug-0.11.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
index 725760f554ae..bbb2b5b5f062 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index dfcc26e52742..e9b912f11a9a 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/xcffib-0.4.2.ebuild b/dev-python/xcffib/xcffib-0.4.2.ebuild
index d27075ce9047..5b5fb5698275 100644
--- a/dev-python/xcffib/xcffib-0.4.2.ebuild
+++ b/dev-python/xcffib/xcffib-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="test"
 
 COMMON_DEPEND="x11-libs/libxcb"
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index d6a19c0f6a3d..d9a69326b6f4 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,3 +1,3 @@
-DIST lcov-1.10.tar.gz 150174 SHA256 8a4661becc95fafad7875786672f7f29b080437825c3ff31d55a49492c15b88f SHA512 0fd94b04677dfaadc49a1c936638bbd09dff1fba07f3b2e7789ba6f6f7e2c58c5f5e69341bf33c9a3c3d8b3590a37cf87d1fbc04083736179a6cc56fc70c3c3f WHIRLPOOL fd89e3d3fd55dc4f92a8a216b88d4a99e1660efaa6097492b680a2e4293eac29fd88dcbbf83ec0b6a2b742d3dd76796e6ad9ce0e6306c2d88ae69b978f4f96aa
 DIST lcov-1.11.tar.gz 155906 SHA256 c282de8d678ecbfda32ce4b5c85fc02f77c2a39a062f068bd8e774d29ddc9bf8 SHA512 db42256c7fbe00d17256ad4944b7e658e65f2dc2b9df1814e25d46a652e92a0ff8bacd4e68de743681df22f4352ffc82b3ccdc0a85723546d7eb64c92e28c0fe WHIRLPOOL 8309d97546a228e3c2c6a4cb95d2dc409be1dde46bd96821c83c3a8105e7026a64b2121f954fbe569f99a70ae4de3b936d7199ff8099bdedf3aee29ba684b3d0
+DIST lcov-1.13.tar.gz 156709 SHA256 44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23 SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e WHIRLPOOL 82a812b8879b8738b237fb0c21f9ca5f4bf2aafe480ab17416d74243a01acb21704a61dfe7c57a99a484d725a230e96f2b5c7c274a866d1a728c9c284956e0b1
 DIST lcov-1.9.tar.gz 140035 SHA256 c37e125d4f0773339de3600d45ad325fe710ea2f0051d7ee2b8a168f450f1aca SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee WHIRLPOOL 2b7e6f1d743ded96e3ecc16c7733b8c76fccbf0aff07a02c02f3e3e08c9fb8f85aa35d4258830f17291fa5d4eedc554c808528b4158919c65439f524c5fd78c7
diff --git a/dev-util/lcov/lcov-1.10.ebuild b/dev-util/lcov/lcov-1.13.ebuild
similarity index 88%
rename from dev-util/lcov/lcov-1.10.ebuild
rename to dev-util/lcov/lcov-1.13.ebuild
index a79b90279f67..5e3eadb9d2bd 100644
--- a/dev-util/lcov/lcov-1.10.ebuild
+++ b/dev-util/lcov/lcov-1.13.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
 HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
diff --git a/kde-apps/cantor/cantor-16.08.3.ebuild b/kde-apps/cantor/cantor-16.08.3.ebuild
index c93a44382665..7ca2b54fc29a 100644
--- a/kde-apps/cantor/cantor-16.08.3.ebuild
+++ b/kde-apps/cantor/cantor-16.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 # FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -52,9 +52,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
 "
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-2.0.3:2
-"
+REPEND="${DEPEND}"
 
 RESTRICT+=" test"
 
diff --git a/kde-apps/cantor/cantor-16.12.1.ebuild b/kde-apps/cantor/cantor-16.12.1.ebuild
index a6e74d95770b..bd14dca6815d 100644
--- a/kde-apps/cantor/cantor-16.12.1.ebuild
+++ b/kde-apps/cantor/cantor-16.12.1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
 # FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -52,9 +52,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	R? ( dev-lang/R )
 "
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:2
-"
+RDEPEND="${DEPEND}"
 
 RESTRICT+=" test"
 
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
index 74e41c07b216..27bb9df0ce73 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,14 +10,14 @@ inherit flag-o-matic kde4-base
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="attica debug desktopglobe eigen exif fcitx ibus json oauth +pim
+IUSE="attica debug desktopglobe exif fcitx ibus json oauth +pim
 qalculate qwt scim"
 
 RESTRICT=test
 # tests hang
 
 # krunner is only needed to generate dbus interface for lancelot
-COMMON_DEPEND="
+DEPEND="
 	app-crypt/qca:2[qt4(+)]
 	kde-plasma/krunner:4
 	kde-plasma/plasma-workspace:4
@@ -34,10 +34,7 @@ COMMON_DEPEND="
 	qwt? ( x11-libs/qwt:5 )
 	scim? ( app-i18n/scim )
 "
-DEPEND="${COMMON_DEPEND}
-	eigen? ( dev-cpp/eigen:2 )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	app-crypt/qca:2[ssl]
 "
 
@@ -45,9 +42,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
 		-DWITH_Nepomuk=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Eigen2=ON
 		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_with desktopglobe Marble)
-		$(cmake-utils_use_find_package eigen Eigen2)
 		$(cmake-utils_use_with exif Kexiv2)
 		$(cmake-utils_use_build ibus)
 		$(cmake-utils_use_with json QJSON)
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index 8235b96ac13b..eb07519bc578 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-apps/marble</pkg></flag>
-		<flag name="eigen">Build Mandelbrot wallpaper plugin using <pkg>dev-cpp/eigen</pkg> using SLOT 2</flag>
 		<flag name="fcitx">Use fcitx input method via <pkg>app-i18n/fcitx</pkg></flag>
 		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
 		<flag name="oauth">Enable OAuth support via <pkg>dev-libs/qoauth</pkg></flag>
diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild
index 6b3f972c8b07..5dd45149342f 100644
--- a/mail-client/mutt/mutt-1.7.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2-r2.ebuild
@@ -18,11 +18,11 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
 IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
 REQUIRED_USE="
 	hcache?   ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?     ( ^^ ( ssl gnutls libressl ) )
-	pop?      ( ^^ ( ssl gnutls libressl ) )
-	nntp?     ( ^^ ( ssl gnutls libressl ) )
-	smime?    ( ^^ ( ssl libressl ) )
-	smtp?     ( ^^ ( ssl gnutls libressl ) )
+	imap?     ( ssl )
+	pop?      ( ssl )
+	nntp?     ( ssl )
+	smime?    ( ssl !gnutls )
+	smtp?     ( ssl )
 	sasl?     ( || ( imap pop smtp nntp ) )
 	kerberos? ( || ( imap pop smtp nntp ) )"
 SLOT="0"
@@ -37,9 +37,13 @@ CDEPEND="
 	qdbm?          ( dev-db/qdbm )
 	tokyocabinet?  ( dev-db/tokyocabinet )
 
-	gnutls?        ( >=net-libs/gnutls-1.0.17:= )
-	libressl?      ( dev-libs/libressl:= )
-	ssl?           ( >=dev-libs/openssl-0.9.6:0= )
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
 
 	nls?           ( virtual/libintl )
 	sasl?          ( >=dev-libs/cyrus-sasl-2 )
@@ -123,9 +127,9 @@ src_configure() {
 		"$(use_enable nntp)"
 		"$(use_enable smtp)"
 
-		"$(use_with gnutls)"
-		"$(use libressl || use ssl && echo --with-ssl)"
-		"$(use !libressl && use !ssl && echo --without-ssl)"
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
 
 		"$(use_with idn)"
 		"$(use_with kerberos gss)"
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index 0a275cc00199..c7edcbb05e47 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc dvb nls static-libs v4l X"
 
-RDEPEND=">=media-libs/libpng-1.5.18[${MULTILIB_USEDEP}]
+RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/zvbi/zvbi-0.2.35.ebuild b/media-libs/zvbi/zvbi-0.2.35.ebuild
deleted file mode 100644
index 679692dae8ee..000000000000
--- a/media-libs/zvbi/zvbi-0.2.35.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils libtool
-
-DESCRIPTION="VBI Decoding Library for Zapping"
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
-HOMEPAGE="http://zapping.sourceforge.net"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc dvb nls static-libs v4l X"
-
-RDEPEND=">=media-libs/libpng-1.4
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	X? ( x11-libs/libXt )"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable v4l) \
-		$(use_enable dvb) \
-		$(use_enable nls) \
-		$(use_with X x) \
-		$(use_with doc doxygen)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	use doc && dohtml -a png,gif,html,css doc/html/*
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index 21c88faa689e..e69de29bb2d1 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -1 +0,0 @@
-DIST kodi-game-libretro-1.0.1.tar.gz 82402 SHA256 319e96e155309a46d03c5312405d530f64b3243ba81f55a2911d510469723d51 SHA512 707fbc64776daed0b8ef72f1a578ad52ee65d10587bf9ee2fc8c6e07bc75e017c7e36427b7e3eb8d773c9d5fdb667418d27e82af0143f7cfb585ca856f0cc0b3 WHIRLPOOL e500bf6e8dc8bca5fb00ee71a9120bd5c70a73702484ecdc1474593f99c53744843af546c929694191c5c84178b8814906a9af11fbe49629f65f12cb08821e4a
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-1.0.1.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-1.0.1.ebuild
deleted file mode 100644
index 57a2a81b03da..000000000000
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/kodi-game/game.libretro"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/kodi-game/game.libretro.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/game.libretro/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
index 57a2a81b03da..8694cd860821 100644
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	=media-tv/kodi-9999
+	=media-libs/kodi-platform-9999
 	=dev-libs/libplatform-2*
 	"
 RDEPEND="
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index a4342d04034f..c88bcb7cea40 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,2 +1 @@
-DIST vmpk-0.6.1.tar.bz2 466218 SHA256 0ce7086d70b9a428a2a2547bb5ba2133dc9fec5c738b966a186d8d015aa35665 SHA512 6ca63abb3cc8a586173ace6ba42e9c26620c0597340317674326e45d2aeb7c47896f50ed636168e16cf574822d4f7c11c5083acbe51ea05330acfafd423b871c WHIRLPOOL c078e13a10b958f70869c1fb1426d343b7a542d31caae7c28601c2ea24f9027df36ad11448ef99f4fe17f9d3e1e93e0b1c8c10b38ffb942e274002216ff5444e
 DIST vmpk-0.6.2a.tar.bz2 452963 SHA256 d1453497690bf4df9155a3414b149b79c6ce5e474f00985d8ccdd9be678ca908 SHA512 89ba161c3ca7ae260d02c175d1116bea7cdfdfddb0f303d8b9177eeb3d77ded8f6126bed43efa6c279daec0a987d0be30c280d59f42a7c145167fb54a7b8db16 WHIRLPOOL 87b954041d89dd3aa18647fc7a7005cd60171897a54644c4cafdfcba3c233ad0b2429cd159a475e274d9ffae78d642ef55d17d3418515fc20250c763c40f0295
diff --git a/media-sound/vmpk/vmpk-0.6.1.ebuild b/media-sound/vmpk/vmpk-0.6.1.ebuild
deleted file mode 100644
index a70afd0f6027..000000000000
--- a/media-sound/vmpk/vmpk-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="http://vmpk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-	>=media-sound/drumstick-1.0.0
-	dbus? ( dev-qt/qtdbus:5 )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_enable dbus DBUS)"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -rf "${D}/usr/share/doc/packages"
-}
diff --git a/media-sound/vmpk/vmpk-0.6.2a.ebuild b/media-sound/vmpk/vmpk-0.6.2a.ebuild
index 3c909f613bbc..2c4a7ea71769 100644
--- a/media-sound/vmpk/vmpk-0.6.2a.ebuild
+++ b/media-sound/vmpk/vmpk-0.6.2a.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="Virtual MIDI Piano Keyboard"
 HOMEPAGE="http://vmpk.sourceforge.net/"
@@ -17,28 +17,27 @@ IUSE="dbus"
 
 RDEPEND="
 	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	x11-libs/libxcb
 	>=media-sound/drumstick-1.0.0
+	x11-libs/libxcb
 	dbus? ( dev-qt/qtdbus:5 )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
 src_configure() {
 	local mycmakeargs=(
-		"$(cmake-utils_use_enable dbus DBUS)"
-		)
+		-DENABLE_DBUS=$(usex dbus)
+	)
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	rm -rf "${D}/usr/share/doc/packages"
+	rm -rf "${D}/usr/share/doc/packages" || die
 }
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 842f92bcd12f..978cb9effcb1 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,8 +1,8 @@
 DIST kodi-16.1-gcc-6.patch 63436 SHA256 cc4d730f163fcc3a99cb67480953cb043c17097d815bf41da441c7e66caaa0dc SHA512 9236608e26685feccd4492c58e7b5c4262e0ac100aabda46a565685eaa19af5b9bbe11f59cecc91de33474ac024ff74d670fe137fa2490f4ec1207817fb7fd23 WHIRLPOOL 336ba43387c154e67a5a3592675f802a50771e3bac14af79f9413773185f6b35e85a1af10988b96238a00e6a9c300caf856435f356572b7fb441e652164c8917
 DIST kodi-16.1-generated-addons-r1.tar.xz 54528 SHA256 ffa06845ed95597b46a178575e361f0641f78778be553d7a9f51b4cc190d2629 SHA512 32c9a5bb6ed5f5d8e73a37c35268c1a7176c6a4c52c5b5e8f6c5c76a3c51445ff0a5b8802be94ada5d63ecbea4d7e69b61d579c931900f6ba6abb583bbe542d9 WHIRLPOOL 3cd62abee6854efbee0070d811d0ef03f7b2d1d629c91d43fb2a2883c83733267affef60339459ce1ca7e30b1b856e20b929883cd12958348803c428d69e142e
 DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d
-DIST kodi-17.0rc4-generated-addons.tar.xz 57544 SHA256 9d6bea616a53e14cec0a0993a953368d69f0ceae423582dfb3d3d1a399915d88 SHA512 e3e37f8b733a037d7fe583d63adb4a5c1e0c2170c99df326ed12dec1ce659ae57df573f4014987622b8a83e68ebbf7dbba8c946c9a78fca122eb636b2c3d28a2 WHIRLPOOL efd5973eec744fdaa84fa1368dd6136a09792f80a4d063c7e1cc50f4d71baf245e4ff8fb079e350794e65106972c464ece9d5a1eef32bdd2c56fd19192a1114c
-DIST kodi-17.0rc4.tar.gz 58091238 SHA256 0fb082436da543777798f84162f2366654fbcd97388e008bb3359204fe7da797 SHA512 bc1abcec27b09d3f6b8231b3973f518055f28a8de883186d5341ec3d11f8bb9aae93d7b318b0a74695ba7512b7d44262bd0be101e44a839551831831f044a700 WHIRLPOOL a09e38b12b723968979cdd3b6ef75297c3b5d7d70ca95ff3b2bd951ec0c713f49eb219cc964577256a918a7c01ed2ca912eafb8538817aabff5eadb780c03005
+DIST kodi-17.0-generated-addons.tar.xz 57552 SHA256 89f7b681e920cec5974ec133e7c895ae2d2372d006e25dc4085668f2e9784813 SHA512 87e1610456c6c21193bc88dc9e62b941ec2caadcac42f9fae13abff193d446452f8ac007810d88990d7549039713ed970d9ac6436fe730794c669cab19fac5b7 WHIRLPOOL 7bf3176511da59226a7974d22cc28d614b16f5db2904ae4b5c6d4ed668808a0fca8440a264bef882091ec1312c3fc83abe99c9dab821fb2d990d28766af68646
+DIST kodi-17.0.tar.gz 58449501 SHA256 4bfffa2493973ae15ab1d922632c09a2583908d6140bc4f58ec8f9314e4f6545 SHA512 ca0d812bcbcc58b74542872365244c5b937803c5618d2277e85a8cb805820ddb22886233d1417fa0e7532c9909749e632e276f8da51d86e1f5f060b2d1ad6a12 WHIRLPOOL f26cc7908c0618904586e255244c7f42814a52d65399a7bb16ba42f4c5079bb82176eb8035af9bf5c56469249dd4af53c161899d276f44634946333440313c53
 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
 DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca
 DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a
diff --git a/media-tv/kodi/kodi-17.0_rc4.ebuild b/media-tv/kodi/kodi-17.0.ebuild
similarity index 100%
rename from media-tv/kodi/kodi-17.0_rc4.ebuild
rename to media-tv/kodi/kodi-17.0.ebuild
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 52eca1b9cfaa..9b94d64e83cd 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Feb 2017 10:21:14 +0000
+Thu, 02 Feb 2017 19:13:21 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 52eca1b9cfaa..9b94d64e83cd 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Feb 2017 10:21:14 +0000
+Thu, 02 Feb 2017 19:13:21 +0000
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r4 b/metadata/md5-cache/app-admin/tripwire-2.4.3.2
similarity index 80%
rename from metadata/md5-cache/app-admin/tripwire-2.4.2.2-r4
rename to metadata/md5-cache/app-admin/tripwire-2.4.3.2
index 43273cf1c299..49f29bfc97da 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.2.2-r4
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=sys-devel/automake sys-devel/autoconf ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Open Source File Integrity Checker and IDS
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.tripwire.org/
 IUSE=libressl ssl static +tools
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=tools? ( app-admin/mktwpol )
 RDEPEND=virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 SLOT=0
-SRC_URI=mirror://sourceforge/tripwire/tripwire-2.4.2.2-src.tar.bz2
+SRC_URI=https://github.com/Tripwire/tripwire-open-source/archive/2.4.3.2.tar.gz -> tripwire-2.4.3.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=46ef08ec12c09297e07814b790cb8162
+_md5_=a920a893762308c4285812ca0cd51236
diff --git a/metadata/md5-cache/app-backup/cdbkup-1.0 b/metadata/md5-cache/app-backup/cdbkup-1.0
deleted file mode 100644
index 240eee6a696d..000000000000
--- a/metadata/md5-cache/app-backup/cdbkup-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=virtual/cdrtools virtual/eject !app-misc/cdcat >=sys-apps/sed-4
-DESCRIPTION=performs full/incremental backups of local/remote filesystems onto CD-R(W)s
-EAPI=0
-HOMEPAGE=http://cdbkup.sourceforge.net/
-KEYWORDS=x86 ppc
-LICENSE=GPL-2
-RDEPEND=virtual/cdrtools virtual/eject !app-misc/cdcat
-SLOT=0
-SRC_URI=mirror://sourceforge/cdbkup/cdbkup-1.0.tar.gz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b1867a1af3cba8e37a7a4371cbe24251
diff --git a/metadata/md5-cache/app-crypt/argon2-20160821 b/metadata/md5-cache/app-crypt/argon2-20160821
index 6a3a3d9789d6..2b5929fda909 100644
--- a/metadata/md5-cache/app-crypt/argon2-20160821
+++ b/metadata/md5-cache/app-crypt/argon2-20160821
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Password hashing software that won the Password Hashing Competition (PHC)
 EAPI=6
 HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
-IUSE=-static-libs
+IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Apache-2.0 CC0-1.0 )
 SLOT=0
 SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20160821.tar.gz -> argon2-20160821.tar.gz
-_md5_=68429a3f79aca9e03d4da8b1c3649583
+_md5_=5d261c81307c5e57b28e53ee5f94b72b
diff --git a/metadata/md5-cache/app-crypt/argon2-20161029 b/metadata/md5-cache/app-crypt/argon2-20161029
new file mode 100644
index 000000000000..65739eefd91d
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/argon2-20161029
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Password hashing software that won the Password Hashing Competition (PHC)
+EAPI=6
+HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Apache-2.0 CC0-1.0 )
+SLOT=0
+SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20161029.tar.gz -> argon2-20161029.tar.gz
+_md5_=18bcbe41aeb5e3b840ad1ac5c6d3bade
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.2.0 b/metadata/md5-cache/app-crypt/eid-mw-4.2.0
new file mode 100644
index 000000000000..87a19f599338
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=gtk? ( x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
+EAPI=6
+HOMEPAGE=http://eid.belgium.be
+IUSE=+dialogs +gtk p11-kit +xpi
+KEYWORDS=~x86 ~amd64 ~arm
+LICENSE=LGPL-3
+RDEPEND=gtk? ( x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
+REQUIRED_USE=dialogs? ( gtk )
+SLOT=0
+SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v4.2.0 -> eid-mw-4.2.0.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=7ac0b6cd84d99c8af3a77707e5fb5c6c
diff --git a/metadata/md5-cache/app-crypt/eid-mw-9999 b/metadata/md5-cache/app-crypt/eid-mw-9999
index c40289d4839a..464aa5006d48 100644
--- a/metadata/md5-cache/app-crypt/eid-mw-9999
+++ b/metadata/md5-cache/app-crypt/eid-mw-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=gtk? ( x11-libs/gtk+:= ) >=sys-apps/pcsc-lite-1.2.9 net-libs/libproxy xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) !app-misc/beid-runtime virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=gtk? ( x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
 EAPI=6
 HOMEPAGE=http://eid.belgium.be
-IUSE=+gtk +xpi +dialogs
+IUSE=+dialogs +gtk p11-kit +xpi
 LICENSE=LGPL-3
-RDEPEND=gtk? ( x11-libs/gtk+:= ) >=sys-apps/pcsc-lite-1.2.9 net-libs/libproxy xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) !app-misc/beid-runtime
+RDEPEND=gtk? ( x11-libs/gtk+:* dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy !app-misc/eid-viewer-bin ) >=sys-apps/pcsc-lite-1.2.9 p11-kit? ( app-crypt/p11-kit ) xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) )
 REQUIRED_USE=dialogs? ( gtk )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	libtool	4890219c51da247200223277f993e054	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0fd6b5f7b650da6ccbddc6acde4736fc
+_md5_=95e7fb28587af9b07e28ece344f7b071
diff --git a/metadata/md5-cache/app-crypt/zuluCrypt-4.7.7 b/metadata/md5-cache/app-crypt/zuluCrypt-4.7.7
deleted file mode 100644
index 2a9984646caf..000000000000
--- a/metadata/md5-cache/app-crypt/zuluCrypt-4.7.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt:0 sys-apps/util-linux sys-fs/cryptsetup gnome? ( app-crypt/libsecret ) gui? ( dev-libs/libpwquality dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( kde-frameworks/kdelibs:4 kde-apps/kwalletd:4 ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Front end to cryptsetup
-EAPI=5
-HOMEPAGE=http://mhogomchungu.github.io/zuluCrypt/
-IUSE=gnome +gui kde udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libgcrypt:0 sys-apps/util-linux sys-fs/cryptsetup gnome? ( app-crypt/libsecret ) gui? ( dev-libs/libpwquality dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( kde-frameworks/kdelibs:4 kde-apps/kwalletd:4 ) ) udev? ( virtual/udev )
-SLOT=0
-SRC_URI=https://github.com/mhogomchungu/zuluCrypt/releases/download/4.7.7/zuluCrypt-4.7.7.tar.bz2
-_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70986a773429223bf598461a0e55d420
diff --git a/metadata/md5-cache/app-emulation/free42-1.5.13 b/metadata/md5-cache/app-emulation/free42-1.5.13
new file mode 100644
index 000000000000..60d218115e95
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/free42-1.5.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An HP-42S Calculator Simulator
+EAPI=6
+HOMEPAGE=http://thomasokken.com/free42/
+IUSE=alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=mirror://gentoo/free42-1.5.13.tgz
+_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=afd74f19046303a2c3d126980d297bc0
diff --git a/metadata/md5-cache/app-misc/zisofs-tools-1.0.6 b/metadata/md5-cache/app-misc/zisofs-tools-1.0.6
deleted file mode 100644
index 8d0a156a6d7a..000000000000
--- a/metadata/md5-cache/app-misc/zisofs-tools-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=sys-libs/zlib-1.1.4
-DESCRIPTION=User utilities for zisofs
-EAPI=0
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/zisofs/
-IUSE=static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.1.4
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/fs/zisofs/zisofs-tools-1.0.6.tar.bz2
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7998eeb5644e4dda2bf70a7c46b6cf46
diff --git a/metadata/md5-cache/app-text/yodl-3.08.02 b/metadata/md5-cache/app-text/yodl-3.08.02
new file mode 100644
index 000000000000..208c21153df3
--- /dev/null
+++ b/metadata/md5-cache/app-text/yodl-3.08.02
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-util/icmake-8.00.00
+DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
+EAPI=6
+HOMEPAGE=https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/fbb-git/yodl/archive/3.08.02.tar.gz -> yodl-3.08.02.tar.gz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=4a21442acc30274abf1233cfa77b84a8
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
new file mode 100644
index 000000000000..3a960494d000
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=a REST console for vim
+EAPI=6
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.6.0.tar.gz -> vim-rest-console-2.6.0.tar.gz
+_eclasses_=vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	vim-plugin	cba1cae8a355e4e89cbd2615aed3b1d5
+_md5_=3e48f529d346101454af4aa688d07609
diff --git a/metadata/md5-cache/dev-lang/swig-3.0.12 b/metadata/md5-cache/dev-lang/swig-3.0.12
new file mode 100644
index 000000000000..e6ba332844d8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swig-3.0.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+DESCRIPTION=Simplified Wrapper and Interface Generator
+EAPI=6
+HOMEPAGE=http://www.swig.org/
+IUSE=ccache doc pcre
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+ BSD BSD-2
+RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/swig/swig-3.0.12.tar.gz
+_md5_=d36af7d86d673c00a8e1fb5ede023bd4
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.5-r4 b/metadata/md5-cache/dev-libs/libevent-2.1.8
similarity index 63%
rename from metadata/md5-cache/dev-libs/libevent-2.1.5-r4
rename to metadata/md5-cache/dev-libs/libevent-2.1.8
index df7c115d5135..76c136e8dcf4 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.5-r4
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A library to execute a function when a specific event occurs on a file descriptor
-EAPI=5
-HOMEPAGE=http://libevent.org/
+EAPI=6
+HOMEPAGE=http://libevent.org/ https://github.com/libevent/libevent/
 IUSE=debug libressl +ssl static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<=dev-libs/9libs-1.0
-SLOT=0/2.1-5
-SRC_URI=mirror://sourceforge/levent/files/libevent-2.1.5-beta.tar.gz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4965f7f88dc1c905cf4a303a9e8541a2
+SLOT=0/2.1-6
+SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/libevent-2.1.8-stable.tar.gz -> libevent-2.1.8.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=3c06818ffa406b180d5c8bbf2dae2a21
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0_rc1 b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0_rc1
index e396eb39a5cd..53ddf3a5ccea 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0_rc1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-4.0.0_rc1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=0/4.0.0_rc1
 SRC_URI=http://www.llvm.org/pre-releases/4.0.0/rc1/llvm-4.0.0rc1.src.tar.xz
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ccb084c2f1a7a5b4d734c0aab6e2ad26
+_md5_=13566ad45d45a243147090fe68b21980
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
index 6a9a18b34ac0..2e5efa6d4103 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9999:=[
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/9999
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f6c1cea02e8828cf0026464a59538174
+_md5_=2bb96efb24eb6d506698c50c15b96203
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.300.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.300.0
deleted file mode 100644
index 97f04f4d934a..000000000000
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.300.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.30.tar.gz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=0d6c10ac11c01938fafce7a9c25cbd84
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.6 b/metadata/md5-cache/dev-python/PySocks-1.6.6
new file mode 100644
index 000000000000..7672d1f8e03a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PySocks-1.6.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=SOCKS client module
+EAPI=6
+HOMEPAGE=https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.6.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=fd20b6da07d737229fa61b7737b8fd77
diff --git a/metadata/md5-cache/dev-python/beaker-1.6.4-r1 b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
index b61c5103c3bd..2a42db39d728 100644
--- a/metadata/md5-cache/dev-python/beaker-1.6.4-r1
+++ b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Session and Caching library with WSGI Middleware
 EAPI=5
 HOMEPAGE=http://beaker.groovie.org/ https://pypi.python.org/pypi/Beaker
 IUSE=test python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Beaker/Beaker-1.6.4.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10c7048b5452bd1aef5736ea3ff4194f
+_md5_=272f7b7dc5a0cd5ba82c6a27a43bc4c6
diff --git a/metadata/md5-cache/dev-python/beaker-1.7.0-r1 b/metadata/md5-cache/dev-python/beaker-1.7.0-r1
index a39e95f4e893..e2d42943ed4e 100644
--- a/metadata/md5-cache/dev-python/beaker-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/beaker-1.7.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Session and Caching library with WSGI Middleware
 EAPI=5
 HOMEPAGE=https://github.com/bbangert/beaker https://pypi.python.org/pypi/Beaker
 IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 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=https://github.com/bbangert/beaker/archive/v1.7.0dev.tar.gz -> beaker-1.7.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2038b73c254312cdb65991dcbae2a0d4
+_md5_=e8b676bc2bfbd45ced58563cd83916d5
diff --git a/metadata/md5-cache/dev-python/beaker-1.8.0 b/metadata/md5-cache/dev-python/beaker-1.8.0
index 0894f2386192..94f3ec8e7575 100644
--- a/metadata/md5-cache/dev-python/beaker-1.8.0
+++ b/metadata/md5-cache/dev-python/beaker-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Session and Caching library with WSGI Middleware
 EAPI=5
 HOMEPAGE=https://github.com/bbangert/beaker https://pypi.python.org/pypi/Beaker
 IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 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/B/Beaker/Beaker-1.8.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6b6f69732cfa171efc8822180af33c1e
+_md5_=344e23195ee9f7d5bb78dda32e592cb5
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.7.2 b/metadata/md5-cache/dev-python/cairocffi-0.7.2
index da37047d29bf..1fa480084608 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.7.2
+++ b/metadata/md5-cache/dev-python/cairocffi-0.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=5
 HOMEPAGE=https://github.com/SimonSapin/cairocffi
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) >=dev-python/xcffib-0.3.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/cairo:0= x11-libs/gdk-pixbuf[jpeg] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.7.2.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=77891122594259daeb431cd372a723f4
+_md5_=a56fa8a2bdd8c03447efebdaf18bee49
diff --git a/metadata/md5-cache/dev-python/ipython-3.2.1-r1 b/metadata/md5-cache/dev-python/ipython-3.2.1-r1
index 90e9891e0549..37198f48bad9 100644
--- a/metadata/md5-cache/dev-python/ipython-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/ipython-3.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=5
 HOMEPAGE=http://ipython.org/
 IUSE=doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplegeneric[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(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mongodb? ( <dev-python/pymongo-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) octave? ( dev-python/oct2py[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(-)] ) smp? ( >=dev-python/pyzmq-13[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(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) notebook? ( dev-libs/mathjax dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mistune-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/terminado-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=www-servers/tornado-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) nbconvert? ( || ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 ) dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mistune-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[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(-)] ) qt4? ( || ( dev-python/PyQt4[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(-),svg] dev-python/PyQt5[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(-),svg] dev-python/pyside[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(-),svg] ) dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=test? ( doc matplotlib mongodb notebook nbconvert octave qt4 wxwidgets ) doc? ( mongodb ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-3.2.1.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2c1065ea03e7aa8166fecf33e647bdb0
+_md5_=f2a6e66c50d85a54f9b19f3b8ed8658e
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.4.3 b/metadata/md5-cache/dev-python/matplotlib-1.4.3
index 03965d0eac8b..45464566a255 100644
--- a/metadata/md5-cache/dev-python/matplotlib-1.4.3
+++ b/metadata/md5-cache/dev-python/matplotlib-1.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=5
 HOMEPAGE=http://matplotlib.org/
 IUSE=cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=>=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull gtk? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[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(-)] ) ) excel? ( dev-python/xlwt[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(-)] ) fltk? ( dev-python/pyfltk[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(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,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(-)] ) qt4? ( dev-python/PyQt4[X,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(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.4.3.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e633a69dc8b7fb8867cf5a3032411a27
+_md5_=a31024b71a9c839e7beff50a8369f77b
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.5.0 b/metadata/md5-cache/dev-python/matplotlib-1.5.0
index 4c0a579f09fd..88bc15cce181 100644
--- a/metadata/md5-cache/dev-python/matplotlib-1.5.0
+++ b/metadata/md5-cache/dev-python/matplotlib-1.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=5
 HOMEPAGE=http://matplotlib.org/
 IUSE=cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[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(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] excel? ( dev-python/xlwt[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(-)] ) fltk? ( dev-python/pyfltk[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(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,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(-)] ) qt4? ( dev-python/PyQt4[X,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(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.5.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fb89d25abdb914fcf5c50872cf5dfe64
+_md5_=d55f57d70724315cbbd5d5e6c4080848
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.5.1 b/metadata/md5-cache/dev-python/matplotlib-1.5.1
index 616106cbb671..080468f725c8 100644
--- a/metadata/md5-cache/dev-python/matplotlib-1.5.1
+++ b/metadata/md5-cache/dev-python/matplotlib-1.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=5
 HOMEPAGE=http://matplotlib.org/
 IUSE=cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[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(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] excel? ( dev-python/xlwt[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(-)] ) fltk? ( dev-python/pyfltk[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(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,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(-)] ) qt4? ( dev-python/PyQt4[X,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(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.5.1.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=754d50cf7fd6c98c0573b1caa62bb112
+_md5_=b0cade3c89191c32f2d0b9559cc6742f
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.5.3 b/metadata/md5-cache/dev-python/matplotlib-1.5.3
deleted file mode 100644
index c4c8f2e08de5..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-1.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[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(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/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(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pure python plotting library with matlab like syntax
-EAPI=6
-HOMEPAGE=http://matplotlib.org/
-IUSE=cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[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(-)] ) ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] excel? ( dev-python/xlwt[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(-)] ) fltk? ( dev-python/pyfltk[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(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,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(-)] ) qt4? ( dev-python/PyQt4[X,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(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/m/matplotlib/matplotlib-1.5.3.tar.gz
-_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a843fa02002a0bc2add8a03ffec0604f
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.5.3-r1 b/metadata/md5-cache/dev-python/matplotlib-1.5.3-r1
new file mode 100644
index 000000000000..99ce76a9b1d6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-1.5.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( dev-python/cairocffi[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(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/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(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=6
+HOMEPAGE=http://matplotlib.org/
+IUSE=cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[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(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull cairo? ( dev-python/cairocffi[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(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] excel? ( dev-python/xlwt[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(-)] ) fltk? ( dev-python/pyfltk[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(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,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(-)] ) qt4? ( dev-python/PyQt4[X,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(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/m/matplotlib/matplotlib-1.5.3.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=58ce6f2a28a2dd307410595181bfe207
diff --git a/metadata/md5-cache/dev-python/mpmath-0.18 b/metadata/md5-cache/dev-python/mpmath-0.18
index f7cf747e7bf6..0147a8448f02 100644
--- a/metadata/md5-cache/dev-python/mpmath-0.18
+++ b/metadata/md5-cache/dev-python/mpmath-0.18
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=5
 HOMEPAGE=https://code.google.com/p/mpmath
 IUSE=doc examples gmp matplotlib test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpmath/mpmath-all-0.18.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=76e1dfce75bfbc0340c2da6f08cc0d24
+_md5_=fb7014df66e13aa31378ee023d1cf071
diff --git a/metadata/md5-cache/dev-python/mpmath-0.19 b/metadata/md5-cache/dev-python/mpmath-0.19
index 20d96cda75f3..1231e0f093e8 100644
--- a/metadata/md5-cache/dev-python/mpmath-0.19
+++ b/metadata/md5-cache/dev-python/mpmath-0.19
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=5
 HOMEPAGE=http://mpmath.org/
 IUSE=doc examples gmp matplotlib test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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=http://mpmath.org/files/mpmath-all-0.19.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=63125c6c78e82e02acc6d0c298f4aae7
+_md5_=c98ea06657dbb369b77d12a11efdbea3
diff --git a/metadata/md5-cache/dev-python/mpmath-0.19-r1 b/metadata/md5-cache/dev-python/mpmath-0.19-r1
index 4e275fe9679e..09a616fc76e9 100644
--- a/metadata/md5-cache/dev-python/mpmath-0.19-r1
+++ b/metadata/md5-cache/dev-python/mpmath-0.19-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=5
 HOMEPAGE=http://mpmath.org/
 IUSE=doc examples gmp matplotlib test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://mpmath.org/files/mpmath-all-0.19.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e1a5e21404468334e487f0ae1f76e044
+_md5_=7584f7badd605c909471e6e229110f16
diff --git a/metadata/md5-cache/dev-python/networkx-1.10 b/metadata/md5-cache/dev-python/networkx-1.10
index ef54a2518d23..6fc7a79c6450 100644
--- a/metadata/md5-cache/dev-python/networkx-1.10
+++ b/metadata/md5-cache/dev-python/networkx-1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=5
 HOMEPAGE=http://networkx.github.io/ https://github.com/networkx/networkx
 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
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.10.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e83acc7257d6a240580e166621d24c36
+_md5_=f22dd5f7adf625b570a0668f48cf1f9e
diff --git a/metadata/md5-cache/dev-python/networkx-1.10-r1 b/metadata/md5-cache/dev-python/networkx-1.10-r1
index cf83fe60bfd3..84a53cbe2a35 100644
--- a/metadata/md5-cache/dev-python/networkx-1.10-r1
+++ b/metadata/md5-cache/dev-python/networkx-1.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=5
 HOMEPAGE=http://networkx.github.io/ https://github.com/networkx/networkx
 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
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.10.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4e037e7cf968f56a43994ec2d1eb7bc8
+_md5_=bbc2c05d57705fe9faf7e24d62160e20
diff --git a/metadata/md5-cache/dev-python/networkx-1.11 b/metadata/md5-cache/dev-python/networkx-1.11
index e493dfb6b816..618bf43a4bf1 100644
--- a/metadata/md5-cache/dev-python/networkx-1.11
+++ b/metadata/md5-cache/dev-python/networkx-1.11
@@ -4,11 +4,11 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=6
 HOMEPAGE=http://networkx.github.io/ https://github.com/networkx/networkx
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.11.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=28fba4c84a1307b97765dfff5448128a
+_md5_=5ea2b64eb6851a32bb18a6b1435acf51
diff --git a/metadata/md5-cache/dev-python/networkx-1.9.1 b/metadata/md5-cache/dev-python/networkx-1.9.1
index be5cf6098a28..5d40883407c6 100644
--- a/metadata/md5-cache/dev-python/networkx-1.9.1
+++ b/metadata/md5-cache/dev-python/networkx-1.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=5
 HOMEPAGE=http://networkx.github.io/ https://github.com/networkx/networkx
 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
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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/n/networkx/networkx-1.9.1.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e2ac33c2aac2af15ccf5e836b4eea4e1
+_md5_=d9bed0dbbaf985e561d24a0ae634995f
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.4-r1 b/metadata/md5-cache/dev-python/numpydoc-0.4-r1
index 969efca773fc..18a2babd81f3 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.4-r1
+++ b/metadata/md5-cache/dev-python/numpydoc-0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx extension to support docstrings in Numpy format
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/numpydoc
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.4.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cddfca3b24f515968871a2a1639c4907
+_md5_=f2fe930e2c212fb7e1d60987d822398a
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.5 b/metadata/md5-cache/dev-python/numpydoc-0.5
index 7a155b1c8884..9fc5755be805 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.5
+++ b/metadata/md5-cache/dev-python/numpydoc-0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx extension to support docstrings in Numpy format
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/numpydoc
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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/n/numpydoc/numpydoc-0.5.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=85300c4d3b60be04d6321eadaa4f9a28
+_md5_=c7f161746ae299b4ce70e1d513176b96
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.6.0 b/metadata/md5-cache/dev-python/numpydoc-0.6.0
index e96d15f9ec9a..ab55ee8a53d3 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.6.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx extension to support docstrings in Numpy format
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/numpydoc
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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/n/numpydoc/numpydoc-0.6.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4b7d936ecf8bffe70a3ffb0b96259399
+_md5_=db5246c2dfd88d3249d117c6de0015b9
diff --git a/metadata/md5-cache/dev-python/oct2py-1.3.0-r1 b/metadata/md5-cache/dev-python/oct2py-1.3.0-r1
index 96d2762d8f15..97331aadbd41 100644
--- a/metadata/md5-cache/dev-python/oct2py-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/oct2py-1.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python to GNU Octave bridge
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/oct2py
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <sci-mathematics/octave-3.8 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/o/oct2py/oct2py-1.3.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8ecc6022f448c6bff325f7310e25c318
+_md5_=1665d7c48d19dd9b39f66cf2db5ffbb2
diff --git a/metadata/md5-cache/dev-python/oct2py-3.3.3 b/metadata/md5-cache/dev-python/oct2py-3.3.3
index 29013cdf7647..6c5fb66df30a 100644
--- a/metadata/md5-cache/dev-python/oct2py-3.3.3
+++ b/metadata/md5-cache/dev-python/oct2py-3.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python to GNU Octave bridge
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/oct2py http://pythonhosted.org/oct2py/ https://github.com/blink1073/oct2py
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sci-libs/scipy-0.12[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(-)] sci-mathematics/octave 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/o/oct2py/oct2py-3.3.3.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=998a8f1f16a200e69729484922372d89
+_md5_=a8753294971ac31346915764f1c44195
diff --git a/metadata/md5-cache/dev-python/oct2py-3.6.0 b/metadata/md5-cache/dev-python/oct2py-3.6.0
index 3cde561e3979..e4ff18007929 100644
--- a/metadata/md5-cache/dev-python/oct2py-3.6.0
+++ b/metadata/md5-cache/dev-python/oct2py-3.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python to GNU Octave bridge
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/oct2py http://pythonhosted.org/oct2py/ https://github.com/blink1073/oct2py
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sci-libs/scipy-0.12[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(-)] >=sci-mathematics/octave-4.2.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-3.6.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c9c6a94c4165383707de7c9ac9eacfbf
+_md5_=bcb277b1541bc648ba2d6e66ffc21920
diff --git a/metadata/md5-cache/dev-python/pyformance-0.3.4 b/metadata/md5-cache/dev-python/pyformance-0.3.4
new file mode 100644
index 000000000000..403c34260d65
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyformance-0.3.4
@@ -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/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Performance metrics, based on Coda Hale's Yammer metrics
+EAPI=6
+HOMEPAGE=https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.python.org/pypi/pyformance/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyformance/pyformance-0.3.4.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=0c1fea34b2d0ba59f01eeda6d7f2e20b
diff --git a/metadata/md5-cache/dev-python/pylast-1.7.0 b/metadata/md5-cache/dev-python/pylast-1.7.0
new file mode 100644
index 000000000000..5d73d2179031
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylast-1.7.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python interface to last.fm and other api-compatible websites
+EAPI=6
+HOMEPAGE=https://github.com/pylast/pylast
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pylast/pylast-1.7.0.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=2265353bceacbdcbac4f57c11876947f
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.11 b/metadata/md5-cache/dev-python/pyquery-1.2.11
index 09a99165f51a..6ff9070d3ca8 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.11
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=A jQuery-like library for python
 EAPI=5
 HOMEPAGE=https://github.com/gawel/pyquery
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.11.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d707e0eed55f41cf58bc1382355a8732
+_md5_=94780edbf073531b2f8b081b40a198b3
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.13 b/metadata/md5-cache/dev-python/pyquery-1.2.13
index a1deb3cc4bd2..10af60f387d4 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.13
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.13
@@ -4,11 +4,11 @@ DESCRIPTION=A jQuery-like library for python
 EAPI=5
 HOMEPAGE=https://github.com/gawel/pyquery
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.13.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d51e4bc6784baf2507d613fb5a86f2c8
+_md5_=dafea2dae248340db41218304baeac89
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.9 b/metadata/md5-cache/dev-python/pyquery-1.2.9
index 8a31e0cd6f65..d408870f6d8a 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.9
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=A jQuery-like library for python
 EAPI=5
 HOMEPAGE=https://github.com/gawel/pyquery
 IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/p/pyquery/pyquery-1.2.9.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5044bcc9dde4fb4c3e54130f6b5111b4
+_md5_=c87426849908e1778343bc17bf93a576
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.9-r1 b/metadata/md5-cache/dev-python/pyquery-1.2.9-r1
index e997aa13cf15..345a8d8e91ad 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.9-r1
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A jQuery-like library for python
 EAPI=5
 HOMEPAGE=https://github.com/gawel/pyquery
 IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/p/pyquery/pyquery-1.2.9.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c1fef7b0f3eb79aecedee58ad777b602
+_md5_=f69db9d7a36c66a3d7402c98d1adbd39
diff --git a/metadata/md5-cache/dev-python/pyzmq-14.4.1 b/metadata/md5-cache/dev-python/pyzmq-14.4.1
index d467df612522..22db686e3ab8 100644
--- a/metadata/md5-cache/dev-python/pyzmq-14.4.1
+++ b/metadata/md5-cache/dev-python/pyzmq-14.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight and super-fast messaging library built on top of the Zer
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq
 IUSE=doc examples green test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-2.1.9:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] green? ( 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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=test? ( green ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-14.4.1.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a652fb71f3f36f710629554ef19b60de
+_md5_=c355f0b4da9f3259e2b4efd4d816d5a5
diff --git a/metadata/md5-cache/dev-python/pyzmq-14.6.0 b/metadata/md5-cache/dev-python/pyzmq-14.6.0
index cab189342717..25a13e56910b 100644
--- a/metadata/md5-cache/dev-python/pyzmq-14.6.0
+++ b/metadata/md5-cache/dev-python/pyzmq-14.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight and super-fast messaging library built on top of the Zer
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq
 IUSE=doc examples green test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] green? ( 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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=test? ( green ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-14.6.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1a92aa6955ddeed3db952dfc7efeef5b
+_md5_=dd7866af9547f4f59c951b4f5f71b4f4
diff --git a/metadata/md5-cache/dev-python/pyzmq-14.7.0 b/metadata/md5-cache/dev-python/pyzmq-14.7.0
index cde0e9a662d4..67f5b0fcaa2d 100644
--- a/metadata/md5-cache/dev-python/pyzmq-14.7.0
+++ b/metadata/md5-cache/dev-python/pyzmq-14.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight and super-fast messaging library built on top of the Zer
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq
 IUSE=doc examples green test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cffi:=[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(-)] green? ( 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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=test? ( green ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-14.7.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7faa85ec43c035885c3aa28f3097da1f
+_md5_=c1c0b079788872ee6e58e3a11edf3a81
diff --git a/metadata/md5-cache/dev-python/pyzmq-15.0.0 b/metadata/md5-cache/dev-python/pyzmq-15.0.0
index 12e2bfef0275..ebffcb6e441e 100644
--- a/metadata/md5-cache/dev-python/pyzmq-15.0.0
+++ b/metadata/md5-cache/dev-python/pyzmq-15.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight and super-fast messaging library built on top of the Zer
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-15.0.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4eeb7030d88e0dbad48f024767548c18
+_md5_=ef0f6ab0e5dfb35b3dba436e7489f7ea
diff --git a/metadata/md5-cache/dev-python/pyzmq-15.1.0 b/metadata/md5-cache/dev-python/pyzmq-15.1.0
index 3d5d895c4103..7b0b5532a5f5 100644
--- a/metadata/md5-cache/dev-python/pyzmq-15.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-15.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight and super-fast messaging library built on top of the Zer
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-15.1.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4eeb7030d88e0dbad48f024767548c18
+_md5_=ef0f6ab0e5dfb35b3dba436e7489f7ea
diff --git a/metadata/md5-cache/dev-python/pyzmq-15.2.0 b/metadata/md5-cache/dev-python/pyzmq-15.2.0
index 618bfc26c20f..8598ab684035 100644
--- a/metadata/md5-cache/dev-python/pyzmq-15.2.0
+++ b/metadata/md5-cache/dev-python/pyzmq-15.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight and super-fast messaging library built on top of the Zer
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.1.2:= dev-python/py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-15.2.0.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2d9cb59337a6a795419ea6ee7ac79e24
+_md5_=ed1beb3cc933d005877b4f0909ec11a2
diff --git a/metadata/md5-cache/dev-python/restkit-4.2.2 b/metadata/md5-cache/dev-python/restkit-4.2.2
index 7d88ea8707d4..05aa60b2c3ff 100644
--- a/metadata/md5-cache/dev-python/restkit-4.2.2
+++ b/metadata/md5-cache/dev-python/restkit-4.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A HTTP ressource kit for Python
 EAPI=5
 HOMEPAGE=https://github.com/benoitc/restkit
 IUSE=+cli doc examples test python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 arm ppc ppc64 ~s390 ~sh x86
+KEYWORDS=amd64 arm ppc64 ~s390 ~sh x86
 LICENSE=MIT
 RDEPEND=cli? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/webob[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/socketpool-0.5.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/http-parser-0.8.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restkit/restkit-4.2.2.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9e39515ad1cb262e81f027f5baa9a359
+_md5_=fdd77178dfe5c6b2a23210ec3e9c0374
diff --git a/metadata/md5-cache/dev-python/robotframework-3.0.1 b/metadata/md5-cache/dev-python/robotframework-3.0.1
new file mode 100644
index 000000000000..c92f8b602ce3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/robotframework-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Test automation framework for acceptance testing & test-driven development
+EAPI=6
+HOMEPAGE=http://robotframework.org/ https://pypi.python.org/pypi/robotframework/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/r/robotframework/robotframework-3.0.1.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=bfbc82b951515528de8c1bc5ee7faa38
diff --git a/metadata/md5-cache/dev-python/webtest-1.4.3-r1 b/metadata/md5-cache/dev-python/webtest-1.4.3-r1
index 614187f2a9e7..07ac44c7a60c 100644
--- a/metadata/md5-cache/dev-python/webtest-1.4.3-r1
+++ b/metadata/md5-cache/dev-python/webtest-1.4.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-python/webob-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-1.4.3.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=91ca8327465ca0ec3b8b5b8a09b3b392
+_md5_=889d0271052af02501f83207e51d05c7
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.16 b/metadata/md5-cache/dev-python/webtest-2.0.16
index 03cd276ba858..0898acb009e1 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.16
+++ b/metadata/md5-cache/dev-python/webtest-2.0.16
@@ -4,11 +4,11 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/W/WebTest/WebTest-2.0.16.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1e55f143a3fbc1b26f44c0dde87fc415
+_md5_=f5ce71d12ccf058b9054b1332e57b177
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.17 b/metadata/md5-cache/dev-python/webtest-2.0.17
index b003ee2d8bc9..d963c244dd61 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.17
+++ b/metadata/md5-cache/dev-python/webtest-2.0.17
@@ -4,11 +4,11 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/W/WebTest/WebTest-2.0.17.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=377f77808c9db0c7c8ccf8171c4a7713
+_md5_=93a027e135c33923d6ce0b928279aacf
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.18 b/metadata/md5-cache/dev-python/webtest-2.0.18
index 6c17acf1f573..a8e89455d655 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.18
+++ b/metadata/md5-cache/dev-python/webtest-2.0.18
@@ -4,11 +4,11 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.18.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8033deff845ae4b65aec779d91dc9450
+_md5_=f9968b1db17c5b6a4fb74dd24b40987c
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.21 b/metadata/md5-cache/dev-python/webtest-2.0.21
index 5d6d6bc74476..3033bb9eead3 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.21
+++ b/metadata/md5-cache/dev-python/webtest-2.0.21
@@ -4,11 +4,11 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/waitress-0.8.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.21.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f9027cdf94c9a21f21b48119890d07dc
+_md5_=503e1f20e878e0466b183df990b3113d
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.11.10 b/metadata/md5-cache/dev-python/werkzeug-0.11.10
deleted file mode 100644
index 688d9e5c55a4..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-0.11.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-xprocess[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=5
-HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.11.10.tar.gz
-_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=59293f584e918032a14d9218922bf324
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.11.8 b/metadata/md5-cache/dev-python/werkzeug-0.11.15
similarity index 87%
rename from metadata/md5-cache/dev-python/werkzeug-0.11.8
rename to metadata/md5-cache/dev-python/werkzeug-0.11.15
index 9501790b503e..ed2ac695bad3 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.11.8
+++ b/metadata/md5-cache/dev-python/werkzeug-0.11.15
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-xprocess[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=5
+EAPI=6
 HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.11.8.tar.gz
-_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=59293f584e918032a14d9218922bf324
+SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.11.15.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=eb76c8cd95c4b11abc869d2847125bce
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.11.9 b/metadata/md5-cache/dev-python/werkzeug-0.11.9
deleted file mode 100644
index 911d4b15bb0c..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-0.11.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-xprocess[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=5
-HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.11.9.tar.gz
-_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=59293f584e918032a14d9218922bf324
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1
index 6e6f13a42600..beb28a18e2f0 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP proxying tools for WSGI apps
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/wsgiproxy/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/W/WSGIProxy2/WSGIProxy2-0.4.1.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=09e737481633a86cd7c13b3e9e5971bc
+_md5_=5a432732ad44d5080b1cf909623e3358
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
index 1bdb928291d1..b71f5d484c75 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP proxying tools for WSGI apps
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/wsgiproxy/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.2.zip
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1aacf314bf2ac03b1825bf2aa2b6eb8d
+_md5_=7e7985d05e14b527d967e4093eb78d1a
diff --git a/metadata/md5-cache/dev-python/xcffib-0.4.2 b/metadata/md5-cache/dev-python/xcffib-0.4.2
index b0e59733ef3f..1703c4f62c4e 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.4.2
+++ b/metadata/md5-cache/dev-python/xcffib-0.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=6
 HOMEPAGE=https://github.com/tych0/xcffib
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/libxcb python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.4.2.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=08396f7fc054f9c419afc89500008d0c
+_md5_=9954de4a48f195d58755918a4a541fbc
diff --git a/metadata/md5-cache/dev-util/lcov-1.10 b/metadata/md5-cache/dev-util/lcov-1.13
similarity index 58%
rename from metadata/md5-cache/dev-util/lcov-1.10
rename to metadata/md5-cache/dev-util/lcov-1.13
index 007ff2910dc6..a2ea3de31d92 100644
--- a/metadata/md5-cache/dev-util/lcov-1.10
+++ b/metadata/md5-cache/dev-util/lcov-1.13
@@ -1,11 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
-EAPI=4
+EAPI=6
 HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
 SLOT=0
-SRC_URI=mirror://sourceforge/ltp/lcov-1.10.tar.gz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c6bf26e3f1c52627d797c2cd43058967
+SRC_URI=mirror://sourceforge/ltp/lcov-1.13.tar.gz
+_md5_=3e1f58e787995c3ea08a49914ad606c5
diff --git a/metadata/md5-cache/kde-apps/cantor-16.08.3 b/metadata/md5-cache/kde-apps/cantor-16.08.3
index 307d95b24b05..915ff1a8a295 100644
--- a/metadata/md5-cache/kde-apps/cantor-16.08.3
+++ b/metadata/md5-cache/kde-apps/cantor-16.08.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kpty-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 analitza? ( >=kde-apps/analitza-16.08.3:5 ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=dev-cpp/eigen-2.0.3:2 sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kpty-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 analitza? ( >=kde-apps/analitza-16.08.3:5 ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 handbook? ( >=kde-frameworks/kdoctools-5.26.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Interface for doing mathematics and scientific computing
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor
 IUSE=analitza lua postscript python qalculate +R debug +handbook test python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.26.0:5 >=kde-frameworks/kcompletion-5.26.0:5 >=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kcrash-5.26.0:5 >=kde-frameworks/kdelibs4support-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kiconthemes-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/knewstuff-5.26.0:5 >=kde-frameworks/kparts-5.26.0:5 >=kde-frameworks/kpty-5.26.0:5 >=kde-frameworks/ktexteditor-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 analitza? ( >=kde-apps/analitza-16.08.3:5 ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 !kde-apps/cantor:4 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kf-env-4 !kde-apps/cantor:4 >=dev-qt/qtcore-5.6.1:5
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.08.3/src/cantor-16.08.3.tar.xz
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	0f198b4acacdcdb65e60a251726f435c	kde5-functions	e944f934c4768113a108eb0184031467	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=73865681a6620089aa834a686bfbd322
+_md5_=c1dd2cdf03c942f815ac07624706078b
diff --git a/metadata/md5-cache/kde-apps/cantor-16.12.1 b/metadata/md5-cache/kde-apps/cantor-16.12.1
index 2bfb11df58f5..be07a98529c4 100644
--- a/metadata/md5-cache/kde-apps/cantor-16.12.1
+++ b/metadata/md5-cache/kde-apps/cantor-16.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.28.0:5 >=kde-frameworks/kcompletion-5.28.0:5 >=kde-frameworks/kconfig-5.28.0:5 >=kde-frameworks/kconfigwidgets-5.28.0:5 >=kde-frameworks/kcoreaddons-5.28.0:5 >=kde-frameworks/kcrash-5.28.0:5 >=kde-frameworks/ki18n-5.28.0:5 >=kde-frameworks/kiconthemes-5.28.0:5 >=kde-frameworks/kio-5.28.0:5 >=kde-frameworks/knewstuff-5.28.0:5 >=kde-frameworks/kparts-5.28.0:5 >=kde-frameworks/kpty-5.28.0:5 >=kde-frameworks/ktexteditor-5.28.0:5 >=kde-frameworks/kwidgetsaddons-5.28.0:5 >=kde-frameworks/kxmlgui-5.28.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 analitza? ( >=kde-apps/analitza-16.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) dev-cpp/eigen:2 sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.28.0:5 handbook? ( >=kde-frameworks/kdoctools-5.28.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.28.0:5 >=kde-frameworks/kcompletion-5.28.0:5 >=kde-frameworks/kconfig-5.28.0:5 >=kde-frameworks/kconfigwidgets-5.28.0:5 >=kde-frameworks/kcoreaddons-5.28.0:5 >=kde-frameworks/kcrash-5.28.0:5 >=kde-frameworks/ki18n-5.28.0:5 >=kde-frameworks/kiconthemes-5.28.0:5 >=kde-frameworks/kio-5.28.0:5 >=kde-frameworks/knewstuff-5.28.0:5 >=kde-frameworks/kparts-5.28.0:5 >=kde-frameworks/kpty-5.28.0:5 >=kde-frameworks/ktexteditor-5.28.0:5 >=kde-frameworks/kwidgetsaddons-5.28.0:5 >=kde-frameworks/kxmlgui-5.28.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=dev-qt/qtxmlpatterns-5.6.1:5 analitza? ( >=kde-apps/analitza-16.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) sys-devel/make >=dev-util/cmake-3.5.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.28.0:5 handbook? ( >=kde-frameworks/kdoctools-5.28.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Interface for doing mathematics and scientific computing
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/16.12.1/src/cantor-16.12.1.tar.xz
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	0f198b4acacdcdb65e60a251726f435c	kde5-functions	e944f934c4768113a108eb0184031467	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d020e75a30ab05c4ec9d8ceda58422e0
+_md5_=b1b03dee58d0d50cd67162040e21dd43
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1
index c71a805d7780..5cad07c5d68e 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-4.14.3-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2[qt4(+)] kde-plasma/krunner:4 kde-plasma/plasma-workspace:4 x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-apps/marble-4.14.3:4[aqua=] ) exif? ( >=kde-apps/libkexiv2-4.14.3:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth:0 ) pim? ( >=kde-apps/kdepimlibs-4.14.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) eigen? ( dev-cpp/eigen:2 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4[webkit]
+DEPEND=app-crypt/qca:2[qt4(+)] kde-plasma/krunner:4 kde-plasma/plasma-workspace:4 x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-apps/marble-4.14.3:4[aqua=] ) exif? ( >=kde-apps/libkexiv2-4.14.3:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth:0 ) pim? ( >=kde-apps/kdepimlibs-4.14.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4[webkit]
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=https://www.kde.org/
-IUSE=attica debug desktopglobe eigen exif fcitx ibus json oauth +pim qalculate qwt scim aqua
+IUSE=attica debug desktopglobe exif fcitx ibus json oauth +pim qalculate qwt scim aqua
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=app-crypt/qca:2[qt4(+)] kde-plasma/krunner:4 kde-plasma/plasma-workspace:4 x11-misc/shared-mime-info attica? ( dev-libs/libattica ) desktopglobe? ( >=kde-apps/marble-4.14.3:4[aqua=] ) exif? ( >=kde-apps/libkexiv2-4.14.3:4[aqua=] ) fcitx? ( app-i18n/fcitx[dbus(+)] ) ibus? ( app-i18n/ibus ) json? ( dev-libs/qjson ) oauth? ( dev-libs/qoauth:0 ) pim? ( >=kde-apps/kdepimlibs-4.14.3:4[aqua=] ) qalculate? ( sci-libs/libqalculate ) qwt? ( x11-libs/qwt:5 ) scim? ( app-i18n/scim ) app-crypt/qca:2[ssl] kde-frameworks/oxygen-icons >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-frameworks/kdelibs-4.14.22:4[webkit]
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kdeplasma-addons-4.14.3.tar.xz
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	958da2c50ab906e72cd6fc7c77146404	kde4-functions	1aadb525279ddf31ca3c8e6d56ebecb5	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=00d444da3735c5c0e78536d916159f20
+_md5_=dc6da2487dead0ca6b6bf97b1569f223
diff --git a/metadata/md5-cache/mail-client/mutt-1.7.2-r2 b/metadata/md5-cache/mail-client/mutt-1.7.2-r2
index 6e971a15cc33..d8cfad9a599c 100644
--- a/metadata/md5-cache/mail-client/mutt-1.7.2-r2
+++ b/metadata/md5-cache/mail-client/mutt-1.7.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) libressl? ( dev-libs/libressl:= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=http://www.mutt.org/
 IUSE=berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) libressl? ( dev-libs/libressl:= ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt )
-REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ^^ ( ssl gnutls libressl ) ) pop? ( ^^ ( ssl gnutls libressl ) ) nntp? ( ^^ ( ssl gnutls libressl ) ) smime? ( ^^ ( ssl libressl ) ) smtp? ( ^^ ( ssl gnutls libressl ) ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt )
+REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.7.2.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.7.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.7.2-patches-r3.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=830749b2de9c91f691c04ec6323bd3b6
+_md5_=58c0a1d06811c75d8fc5341a2fad70a5
diff --git a/metadata/md5-cache/media-libs/zvbi-0.2.35 b/metadata/md5-cache/media-libs/zvbi-0.2.35
deleted file mode 100644
index 9c51993d2078..000000000000
--- a/metadata/md5-cache/media-libs/zvbi-0.2.35
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libpng-1.4 sys-libs/zlib nls? ( virtual/libintl ) X? ( x11-libs/libX11 ) virtual/os-headers doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) X? ( x11-libs/libXt )
-DESCRIPTION=VBI Decoding Library for Zapping
-EAPI=5
-HOMEPAGE=http://zapping.sourceforge.net
-IUSE=doc dvb nls static-libs v4l X
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=media-libs/libpng-1.4 sys-libs/zlib nls? ( virtual/libintl ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/zapping/zvbi-0.2.35.tar.bz2
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1efc5583c0f84c57f55518b86e8824d7
diff --git a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1 b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
index 4595f99606ba..159cb652102f 100644
--- a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
+++ b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libpng-1.5.18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/os-headers doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) X? ( x11-libs/libXt )
+DEPEND=>=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/os-headers doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) X? ( x11-libs/libXt )
 DESCRIPTION=VBI Decoding Library for Zapping
 EAPI=5
 HOMEPAGE=http://zapping.sourceforge.net
 IUSE=doc dvb nls static-libs v4l X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=media-libs/libpng-1.5.18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zapping/zvbi-0.2.35.tar.bz2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=28a51724881ae29113ea60ff2d091f07
+_md5_=4eede21b88df6bcb13aa0d3df81852b2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-1.0.1 b/metadata/md5-cache/media-plugins/kodi-game-libretro-1.0.1
deleted file mode 100644
index 2d174a2ca5e5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-tv/kodi media-libs/kodi-platform =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=6
-HOMEPAGE=https://github.com/kodi-game/game.libretro
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-tv/kodi media-libs/kodi-platform =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro/archive/v1.0.1.tar.gz -> kodi-game-libretro-1.0.1.tar.gz
-_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	kodi-addon	ed9d0b2d79a8283ed0f06617b198a601	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c8c54c53709171ceaf8a43780a1c39c9
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
index 49abc5f32f08..c722001e3f15 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-tv/kodi media-libs/kodi-platform =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.5.2 >=dev-vcs/git-1.8.2.1
+DEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.5.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Libretro compatibility layer for the Kodi Game API
 EAPI=6
 HOMEPAGE=https://github.com/kodi-game/game.libretro
 LICENSE=GPL-2
-RDEPEND=media-tv/kodi media-libs/kodi-platform =dev-libs/libplatform-2*
+RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
 SLOT=0
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	kodi-addon	ed9d0b2d79a8283ed0f06617b198a601	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c8c54c53709171ceaf8a43780a1c39c9
+_md5_=46cc57d568ed63d862e15d3a1f43f476
diff --git a/metadata/md5-cache/media-sound/vmpk-0.6.1 b/metadata/md5-cache/media-sound/vmpk-0.6.1
deleted file mode 100644
index 4c7edca59a5f..000000000000
--- a/metadata/md5-cache/media-sound/vmpk-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=media-sound/drumstick-1.0.0 dbus? ( dev-qt/qtdbus:5 ) app-text/docbook-xsl-stylesheets dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Virtual MIDI Piano Keyboard
-EAPI=4
-HOMEPAGE=http://vmpk.sourceforge.net/
-IUSE=dbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=media-sound/drumstick-1.0.0 dbus? ( dev-qt/qtdbus:5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vmpk/vmpk-0.6.1.tar.bz2
-_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9b12579ad98cc7063e6bb3f49969a638
diff --git a/metadata/md5-cache/media-sound/vmpk-0.6.2a b/metadata/md5-cache/media-sound/vmpk-0.6.2a
index 5d6d52259bed..55955d22b2ca 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.6.2a
+++ b/metadata/md5-cache/media-sound/vmpk-0.6.2a
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=media-sound/drumstick-1.0.0 dbus? ( dev-qt/qtdbus:5 ) app-text/docbook-xsl-stylesheets dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-1.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) app-text/docbook-xsl-stylesheets dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
 DESCRIPTION=Virtual MIDI Piano Keyboard
-EAPI=4
+EAPI=6
 HOMEPAGE=http://vmpk.sourceforge.net/
 IUSE=dbus
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=media-sound/drumstick-1.0.0 dbus? ( dev-qt/qtdbus:5 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-1.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.6.2a.tar.bz2
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=adc780812039c5ebd93320158ffb03b7
+_md5_=7c59480710332bdd2e0fad8baecae3c4
diff --git a/metadata/md5-cache/media-tv/kodi-17.0_rc4 b/metadata/md5-cache/media-tv/kodi-17.0
similarity index 96%
rename from metadata/md5-cache/media-tv/kodi-17.0_rc4
rename to metadata/md5-cache/media-tv/kodi-17.0
index 9bd56ef3e3aa..cdf166d5e5c4 100644
--- a/metadata/md5-cache/media-tv/kodi-17.0_rc4
+++ b/metadata/md5-cache/media-tv/kodi-17.0
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 >=media-video/ffmpeg-3.1.6:=[encode] mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) media-video/ffmpeg[vdpau] ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz https://github.com/xbmc/xbmc/archive/17.0rc4-Krypton.tar.gz -> kodi-17.0rc4.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.0rc4-generated-addons.tar.xz )
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz https://github.com/xbmc/xbmc/archive/17.0-Krypton.tar.gz -> kodi-17.0.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.0-generated-addons.tar.xz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d16a4a79a3a40f3fd255b9189462c29b
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.123-r3 b/metadata/md5-cache/net-misc/badvpn-1.999.123-r3
deleted file mode 100644
index f6448bc1f8a2..000000000000
--- a/metadata/md5-cache/net-misc/badvpn-1.999.123-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) ncd? ( dev-libs/openssl ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
-EAPI=4
-HOMEPAGE=https://code.google.com/p/badvpn/
-IUSE=+client +ncd +server +tun2socks +udpgw debug
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) ncd? ( dev-libs/openssl ) ncd? ( net-firewall/iptables net-wireless/wpa_supplicant sys-apps/iproute2 >=virtual/udev-171 )
-REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
-SLOT=0
-SRC_URI=https://badvpn.googlecode.com/files/badvpn-1.999.123.tar.bz2
-_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ef726f216b2c217961f44445f042fba4
diff --git a/metadata/md5-cache/net-misc/quagga-1.1.1 b/metadata/md5-cache/net-misc/quagga-1.1.1
new file mode 100644
index 000000000000..d9f77c306e18
--- /dev/null
+++ b/metadata/md5-cache/net-misc/quagga-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=caps? ( sys-libs/libcap ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/gawk sys-devel/libtool:2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
+EAPI=6
+HOMEPAGE=http://quagga.net/
+IUSE=bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2
+SLOT=0
+SRC_URI=mirror://nongnu/quagga/quagga-1.1.1.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
+_md5_=3ce6f7ac60440feba0ede88aa4da59e9
diff --git a/metadata/md5-cache/net-misc/sshpass-1.06 b/metadata/md5-cache/net-misc/sshpass-1.06
new file mode 100644
index 000000000000..40f4d859dbba
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sshpass-1.06
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Tool for noninteractively performing password authentication with ssh
+EAPI=6
+HOMEPAGE=http://sshpass.sourceforge.net
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=net-misc/openssh
+SLOT=0
+SRC_URI=mirror://sourceforge/sshpass/1.06/sshpass-1.06.tar.gz
+_md5_=6831f6a917dfdfcf9ae106924bf582a4
diff --git a/metadata/md5-cache/sci-biology/biopython-1.68 b/metadata/md5-cache/sci-biology/biopython-1.68
index f06f93b9b925..956b32cf42c2 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.68
+++ b/metadata/md5-cache/sci-biology/biopython-1.68
@@ -4,11 +4,11 @@ DESCRIPTION=Python modules for computational molecular biology
 EAPI=6
 HOMEPAGE=http://www.biopython.org/ https://pypi.python.org/pypi/biopython/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/networkx[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://www.biopython.org/DIST/biopython-1.68.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2d6e484286d13acfee2452276259d598
+_md5_=567b3f08e4df1c6c22840092ec59aa32
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-3.2.21-r1 b/metadata/md5-cache/sci-libs/linux-gpib-3.2.21-r1
deleted file mode 100644
index 0b5825727101..000000000000
--- a/metadata/md5-cache/sci-libs/linux-gpib-3.2.21-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) firmware? ( sys-apps/fxload ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Kernel module and driver library for GPIB (IEEE 488.2) hardware
-EAPI=5
-HOMEPAGE=http://linux-gpib.sourceforge.net/
-IUSE=isa pcmcia static debug guile perl php python tcl doc firmware kernel_linux python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) firmware? ( sys-apps/fxload ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-3.2.21.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz ) https://dev.gentoo.org/~dilfridge/distfiles/linux-gpib-3.2.21-ctrl-c.patch.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	linux-mod	0ccff2c1a7d70cf1678059b64bcf9183	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	0498b698e76cdc94930b59a00c73dd9c	unpacker	45d07319df5f40ee6af58418b0f930be	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=974f05426a74845a32d83ce98da953cc
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.2.0-r3 b/metadata/md5-cache/sci-mathematics/octave-4.2.0-r3
index c96453381749..52c4c3d7234a 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.2.0-r3
+++ b/metadata/md5-cache/sci-mathematics/octave-4.2.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) openssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) gui? ( dev-qt/linguist-tools:5 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) java? ( >=virtual/jdk-1.6.0 ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended dev-texlive/texlive-metapost ) sys-apps/texinfo dev-util/gperf virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) openssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) gui? ( dev-qt/linguist-tools:5 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) java? ( >=virtual/jdk-1.6.0 ) doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended dev-texlive/texlive-genericrecommended dev-texlive/texlive-metapost ) sys-apps/texinfo dev-util/gperf virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=6
 HOMEPAGE=http://www.octave.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0/4.2.0
 SRC_URI=mirror://gnu/octave/octave-4.2.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7686c933cb7cf043dd628764d5c4f187
+_md5_=53fbc6f8f9c60907e3f73f946575fa74
diff --git a/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1 b/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
index 5a046f29adc4..369a176ea2fa 100644
--- a/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
+++ b/metadata/md5-cache/sys-block/seekwatcher-0.12_p20091015-r1
@@ -4,11 +4,11 @@ DESCRIPTION=generates graphs from blktrace to help visualize IO patterns and per
 EAPI=6
 HOMEPAGE=http://oss.oracle.com/~mason/seekwatcher/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-block/blktrace-0.0.20070730162628 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/seekwatcher-0.12_p20091015.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=de451d08beb14b954344cfe1da08e25f
+_md5_=190edc47049ac3b382773d48d8de51ac
diff --git a/metadata/md5-cache/sys-devel/lld-4.0.0_rc1 b/metadata/md5-cache/sys-devel/lld-4.0.0_rc1
index e14ec34732fa..b425cc8b22da 100644
--- a/metadata/md5-cache/sys-devel/lld-4.0.0_rc1
+++ b/metadata/md5-cache/sys-devel/lld-4.0.0_rc1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~sys-devel/llvm-4.0.0_rc1 test? ( ~dev-python/lit-4.0.0_rc1 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-4.0.0_rc1 test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-4.0.0_rc1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=The LLVM linker (link editor)
 EAPI=6
 HOMEPAGE=http://llvm.org/
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-4.0.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.llvm.org/pre-releases/4.0.0/rc1/lld-4.0.0rc1.src.tar.xz test? ( http://www.llvm.org/pre-releases/4.0.0/rc1/llvm-4.0.0rc1.src.tar.xz )
-_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=76d960b9d2b4d8546eb79977aa94f356
+_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=eba653429a602d056d065fdd527c80ee
diff --git a/metadata/md5-cache/sys-devel/lld-9999 b/metadata/md5-cache/sys-devel/lld-9999
index b8ab90b1e948..f8d14fb1bfc4 100644
--- a/metadata/md5-cache/sys-devel/lld-9999
+++ b/metadata/md5-cache/sys-devel/lld-9999
@@ -1,12 +1,11 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~sys-devel/llvm-9999 test? ( ~dev-python/lit-9999 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-9999 test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=The LLVM linker (link editor)
 EAPI=6
 HOMEPAGE=http://llvm.org/
 IUSE=test
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-9999
-RESTRICT=test
 SLOT=0
-_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e412c3891058674055d2a2ac81cb8af0
+_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=464b9749782d92a4ec1b83ec464e73ad
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2 b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
index cb6c2bab03fc..27bcc4d47ba8 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
 EAPI=5
 HOMEPAGE=http://www.tuxera.com/community/ntfs-3g-download/
 IUSE=acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 )
 SLOT=0/87
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2016.2.22.tgz
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	0498b698e76cdc94930b59a00c73dd9c	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0e1866d2386fe29332e5b99eaa9ee38f
+_md5_=086f348e9e9589c74b02a48ff0deba47
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.7 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.7
new file mode 100644
index 000000000000..8196bd9cf00d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=5
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-9.base.tar.xz mirror://gentoo/genpatches-4.9-9.extras.tar.xz mirror://gentoo/genpatches-4.9-9.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	kernel-2	e8e266e84046228629e450852397a75d	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=da208c89323de94210b8ce3ca0122b88
diff --git a/metadata/md5-cache/www-client/opera-beta-43.0.2442.21 b/metadata/md5-cache/www-client/opera-beta-43.0.2442.686
similarity index 91%
rename from metadata/md5-cache/www-client/opera-beta-43.0.2442.21
rename to metadata/md5-cache/www-client/opera-beta-43.0.2442.686
index b74c054a8c71..b5370fd44668 100644
--- a/metadata/md5-cache/www-client/opera-beta-43.0.2442.21
+++ b/metadata/md5-cache/www-client/opera-beta-43.0.2442.686
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+: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-beta/43.0.2442.21/linux/opera-beta_43.0.2442.21_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-beta/43.0.2442.21/linux/opera-beta_43.0.2442.21_i386.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-beta/43.0.2442.686/linux/opera-beta_43.0.2442.686_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-beta/43.0.2442.686/linux/opera-beta_43.0.2442.686_i386.deb )
 _eclasses_=chromium-2	c30f482b868782938c772c21d9ede135	eutils	ea170b525f6a38a006be05c9d9429f13	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ceb02ba9198e11e0e8f2068c0cb246a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 52eca1b9cfaa..9b94d64e83cd 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Feb 2017 10:21:14 +0000
+Thu, 02 Feb 2017 19:13:21 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index f62eb2a8743e..265d24a5caf4 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2879,11 +2879,6 @@ developers and volunteer mentors.</description>
       <name>Jonathan Callen</name>
       <role>Developer</role>
     </member>
-    <member>
-      <email>junghans@gentoo.org</email>
-      <name>Christoph Junghans</name>
-      <role>Developer, merge with gx86</role>
-    </member>
   </project>
   <project>
     <email>printing@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index 1281b4d2dde7..625c358af722 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Feb  2 10:17:16 UTC 2017
+Thu Feb  2 19:09:29 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fb5c70310656..bc9623cdbc53 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Feb 2017 10:30:01 +0000
+Thu, 02 Feb 2017 19:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index df794b637288..f0e89303a3da 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1486030801 Thu 02 Feb 2017 10:20:01 AM UTC
+1486062601 Thu 02 Feb 2017 07:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 52eca1b9cfaa..9b94d64e83cd 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Feb 2017 10:21:14 +0000
+Thu, 02 Feb 2017 19:13:21 +0000
diff --git a/net-misc/badvpn/Manifest b/net-misc/badvpn/Manifest
index fe9006ebe8b9..7e8dc8fbecf9 100644
--- a/net-misc/badvpn/Manifest
+++ b/net-misc/badvpn/Manifest
@@ -1,4 +1,3 @@
-DIST badvpn-1.999.123.tar.bz2 905823 SHA256 e971ec1c093da2ada77d14592ceefcd263ae2831ff95a3da8ee55a13495abb40 SHA512 24e591aeb907f3e5249e1b01ce62fb18a7e60898952b874ada633fa4ac31c1b456184245a67563f6977f080f9ae93da5c39049948b2eecc1e526b0c0c366b6d1 WHIRLPOOL d2440a8c427cb7c25e493fba7e9320e2ac201e9b82b6cb5f08a752b77c2121efe70694e317eff1c1c90da50e398b341e1e6bf9469f57c19a5ab9861d5a2531c8
 DIST badvpn-1.999.126.tar.bz2 936233 SHA256 188440a6d2fa575162f65baf4b8a2645d6fda71ef1a20794ec0be42a3053f2ff SHA512 3d0bbe3c8f91a3cb758b78a0fce4fd111f93fa0578ce06f0a8db5cc575d02f52248b37e7fa097447589257e47084a607a9df7078448ef44ae9fb66eb59e8b9e2 WHIRLPOOL 6767bc359c92d85d91f7b32d15c17bd0f33dcaa36716d8cc3b87eb59a110d7d26d91b38145e9f47cce3950f49470756ade29c6768b956f27108fff143248ac79
 DIST badvpn-1.999.127.tar.bz2 962224 SHA256 d20c79d69a7aa9eac1e0bf9a52fb9c9cdca78be123b6d17d59ff277f282e7943 SHA512 7484a817795392a52b44d3bf68765652739029aae8c16965b433bbfb4ca67ea70048f76376ba445196aac07a8f19f97696917ad24fe2bcb34025adda1f18a9fb WHIRLPOOL a3030691d50add2f76854b3a4c3cd1a66c3d3c53b0780c592e0a7337907c7d253a4ea552c57c26e03abc0adf5c4d2f416b18a3e74bc3a6af9b9182927cd721f5
 DIST badvpn-1.999.128.tar.bz2 1000636 SHA256 d6b28d5d566470dd1b0584b14b7ffab8159e4f604c1facbf9ef3a3ddbc0c9bfc SHA512 7d59e8365c10e7164c6c74b95d5f212ae0c480870bea31a6fb4ed25883f28bb6365e09a9271a9ecedccccd886e5f5e50a6f6df406ee3c40fad40031bbd3f049b WHIRLPOOL 5541a8d91a48f69fb5646451c276d0dd8844e508f9a33d553f08c5aabbe2c6d5bab8bd6073829641facec861d507cfce7c346497bc3f321033dd46c036f719d9
diff --git a/net-misc/badvpn/badvpn-1.999.123-r3.ebuild b/net-misc/badvpn/badvpn-1.999.123-r3.ebuild
deleted file mode 100644
index f85fdbad7c0e..000000000000
--- a/net-misc/badvpn/badvpn-1.999.123-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils cmake-utils user
-
-MY_P=${PN}-${PV/_rc/rc}
-DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
-HOMEPAGE="https://code.google.com/p/badvpn/"
-SRC_URI="https://badvpn.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-SLOT="0"
-TARGETS="+client +ncd +server +tun2socks +udpgw"
-IUSE="${TARGETS} debug"
-
-COMMON_DEPEND="
-	client? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	server? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	ncd? (
-		dev-libs/openssl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	ncd? (
-		net-firewall/iptables
-		net-wireless/wpa_supplicant
-		sys-apps/iproute2
-		>=virtual/udev-171
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-# we need at least one target
-REQUIRED_USE="|| ( ${TARGETS//+/} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser ${PN}
-}
-
-src_prepare() {
-	# allow user to easily apply patches
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_NOTHING_BY_DEFAULT=1
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build server SERVER)
-		$(cmake-utils_use_build ncd NCD)
-		$(cmake-utils_use_build tun2socks TUN2SOCKS)
-		$(cmake-utils_use_build udpgw UDPGW)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog
-
-	if use server; then
-		newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
-		newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
-	fi
-
-	if use ncd; then
-		newinitd "${FILESDIR}"/${PN}-ncd.init ${PN}-ncd
-		newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
-	fi
-}
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index ed50e66e3e3b..d04304399871 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,2 +1,3 @@
 DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e
 DIST quagga-1.1.0.tar.gz 2870278 SHA256 f7a43a9c59bfd3722002210530b2553c8d5cc05bfea5acd56d4f102b9f55dc63 SHA512 3b29a90c4f05593714bda3c702fd2c8886ce48fba2fbfb98f55cc04d1025edd5427944e9a9fb7cd630e5e8ccea388b72a8e611ab65c370e760f3f319d03f090f WHIRLPOOL ee4a78b1d20aa9e7e7aea1f0be2adee83efa0fd47a807a4ec1affb1e059fee156861b612f73716cbf80e96cc6676baed062b9440ea7664198078cd6760380573
+DIST quagga-1.1.1.tar.gz 2871705 SHA256 b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f SHA512 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58 WHIRLPOOL 795aa54b7930c441cbbc40a67db75865ccecada523164c906dd4a1b385b51820bff061ca58265fc67d1a814c8162d8b6e6758a4aab47ba54dab58cf846cb28be
diff --git a/net-misc/quagga/quagga-1.1.1.ebuild b/net-misc/quagga/quagga-1.1.1.ebuild
new file mode 100644
index 000000000000..76d456f5dd23
--- /dev/null
+++ b/net-misc/quagga/quagga-1.1.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
+HOMEPAGE="http://quagga.net/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+
+IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	protobuf? ( dev-libs/protobuf-c:0= )
+	readline? (
+		sys-libs/readline:0=
+		pam? ( sys-libs/pam )
+	)
+	snmp? ( net-analyzer/net-snmp )
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/gawk
+	sys-devel/libtool:2"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# do not build PDF docs
+	export ac_cv_prog_PDFLATEX=no
+	export ac_cv_prog_LATEXMK=no
+
+	econf \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--enable-irdp \
+		--enable-isisd \
+		--enable-isis-topology \
+		--enable-pimd \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-cflags="${CFLAGS}" \
+		--with-pkg-extra-version="-gentoo" \
+		--sysconfdir=/etc/quagga \
+		--localstatedir=/run/quagga \
+		--disable-static \
+		$(use_enable caps capabilities) \
+		$(usex snmp '--enable-snmp' '' '' '') \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable tcp-zebra) \
+		$(use_enable doc) \
+		$(usex multipath $(use_enable multipath) '' '=0' '') \
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(use_enable readline vtysh) \
+		$(use_with pam libpam) \
+		$(use_enable protobuf) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 rtadv)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	readme.gentoo_create_doc
+
+	keepdir /etc/quagga
+	fowners root:quagga /etc/quagga
+	fperms 0770 /etc/quagga
+
+	# Path for PIDs before first reboot should be created here, bug #558194
+	dodir /run/quagga
+	fowners quagga:quagga /run/quagga
+	fperms 0770 /run/quagga
+
+	# Install systemd-related stuff, bug #553136
+	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
+	systemd_dounit "${FILESDIR}/systemd/zebra.service"
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
+
+	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd); do
+		dosym zebra /etc/init.d/${service}
+		systemd_dounit "${FILESDIR}/systemd/${service}.service"
+	done
+
+	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
+
+	insinto /etc/logrotate.d
+	newins redhat/quagga.logrotate quagga
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 1235192253c6..f1820655ac22 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1 +1,2 @@
 DIST sshpass-1.05.tar.gz 98362 SHA256 c3f78752a68a0c3f62efb3332cceea0c8a1f04f7cf6b46e00ec0c3000bc8483e SHA512 92ff3428a3cbc2b517e8ee0a6676b409bac3ec0900bfb370cf3882ccc62017edb695ce00e025f73680e9718e1b0213b2ac1bbd2a2558fe43f0f5a7b0d690c810 WHIRLPOOL 15c951f1c7e66a3967d5ed2c541862b95056faab108976206d6e81e76d6234ff116e7f490925305482238b5c86098a6783a691c8f436d8911ffea159df275ff0
+DIST sshpass-1.06.tar.gz 112205 SHA256 c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60 SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8 WHIRLPOOL 1a3c17f61bad4ad61eab8e13f3582fab833cbbebb4768c55383f3ec74935e68e61d7ef4c45be399a4d07c9dd0a2a9fd0abfec7d2351236f070d7cf6b8cdd182c
diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild
new file mode 100644
index 000000000000..8029df646a3c
--- /dev/null
+++ b/net-misc/sshpass/sshpass-1.06.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Tool for noninteractively performing password authentication with ssh"
+HOMEPAGE="http://sshpass.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND="net-misc/openssh"
diff --git a/profiles/package.mask b/profiles/package.mask
index 406b94a4223f..c8c2fe28e550 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Palimaka <kensington@gentoo.org> (02 Feb 2017)
+# Upstream missing. Ancient. Unmaintained. No revdeps.
+# Masked for removal in 30 days.
+dev-libs/safestr
+dev-libs/xxl
+
 # Michał Górny <mgorny@gentoo.org> (01 Feb 2017)
 # Fails to compile with USE=static. It is a system package, so a lot
 # of people are hitting this. Furthermore, people keep working it around
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8c5cddc62bc4..0edf97c88909 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -282,6 +282,7 @@ app-crypt/ccid:twinserial - Enable twinserial reader
 app-crypt/codecrypt:cryptopp - Build algorithms that need Crypto++ support dev-libs/crypto++
 app-crypt/eid-mw:dialogs - Enable "askaccess" dialog box, by using x11-libs/gtk+
 app-crypt/eid-mw:gtk - All dialogs are available, by using x11-libs/gtk+
+app-crypt/eid-mw:p11-kit - Support for app-crypt/p11-kit.
 app-crypt/eid-mw:xpi - Build and install an extension for Mozilla browsers.
 app-crypt/ekeyd:minimal - Only install the ekey-egd-linux service rather than the full ekeyd package.
 app-crypt/ekeyd:munin - Install a plugin for net-analyzer/munin to graph statistical data from ekeyd.
@@ -3388,7 +3389,6 @@ kde-plasma/kdebase-startkde:crash-reporter - Builds a gui tool to submit crash i
 kde-plasma/kdebase-startkde:wallpapers - Install the KDE Plasma wallpapers
 kde-plasma/kdeplasma-addons:attica - Enable support for dev-libs/libattica
 kde-plasma/kdeplasma-addons:desktopglobe - Enable Desktop Globe wallpaper using kde-apps/marble
-kde-plasma/kdeplasma-addons:eigen - Build Mandelbrot wallpaper plugin using dev-cpp/eigen using SLOT 2
 kde-plasma/kdeplasma-addons:fcitx - Use fcitx input method via app-i18n/fcitx
 kde-plasma/kdeplasma-addons:ibus - Use ibus input method via app-i18n/ibus
 kde-plasma/kdeplasma-addons:json - Enable JSON support via dev-libs/qjson
diff --git a/sci-biology/biopython/biopython-1.68.ebuild b/sci-biology/biopython/biopython-1.68.ebuild
index 5bf6fa6ab836..8a753340b6ec 100644
--- a/sci-biology/biopython/biopython-1.68.ebuild
+++ b/sci-biology/biopython/biopython-1.68.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 8f1e48d59bc7..01fbf21f2a53 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,4 +1,2 @@
 DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67
-DIST linux-gpib-3.2.21-ctrl-c.patch.gz 10477 SHA256 697a460ea8515788765983afb5c27ad527e6ab1e75232133c572530643351916 SHA512 4b34ecbc5a3f3170337808397df19b9cf09d3fc8a53052fb560ae7b5336b946c6b1c76ba24b0ad66d4bb5a005902fe8599bb7e981c140a68046b9f14ed5268b3 WHIRLPOOL 5656ed7d4dafeff4b766f247c4f495444d271130cbad8bedaef9b761e14b57c09b46a7ccd5e3be5ff50934f48a88a987eb71f6997aafdcd4adc486c49b2c0c5d
-DIST linux-gpib-3.2.21.tar.gz 1274505 SHA256 31fd86f4897239ffc55e0d4d850586d24d74144b604d6d39fd33dc59d28f7019 SHA512 539f7444e6bcd07d66cabc3abae9d40cdea3a84365bd69a4621149bc11b7b0e9826650d91d2a048d9780fab7db30005b08a4b91c77e7a26e036ed6f5adb6850b WHIRLPOOL 72a9c929d7e3b79c5c954fb6e41c4d9eb450595c6dccc877a3b47851e467e741b191a708ec3c018e4fe576e5677ffec5986970f83c020707bbbd8e2968e43153
 DIST linux-gpib-4.0.3.tar.gz 1311963 SHA256 6af5113978d179d2f281f5d779f235935371bdfbb15c6c7ca848bca5c3f17c4a SHA512 6eb65cae5220d3c7ca607eed5a641e8a68b422d0e76a787e767d3bffd0695672d5137d44a097483176e933ded5eb376ff57e3a61cddd62aceaa43192218c9cfe WHIRLPOOL f0df699fbdaa7d77abd114c8fef1b6ff3aacd67cc233a68f78b0db67b30baeab615beff89861ed47a70216e1fe0d73c518050f80c9d70d0c8199b2b159e068a1
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-reallydie.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-reallydie.patch
deleted file mode 100644
index e52cce4bd385..000000000000
--- a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-reallydie.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: drivers/Makefile.am
-===================================================================
---- drivers/Makefile.am	(revision 1602)
-+++ drivers/Makefile.am	(working copy)
-@@ -15,10 +15,8 @@
- 
- -include $(top_srcdir)/util/linux_flags/flags
- 
--#ignore errors from kernel's make modules in all-local, to avoid failure of make install
--#on nfs filesystem with root_squash
- all-local:
--	-$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
-+	$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
- 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
- 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
- 
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build2.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build2.patch
deleted file mode 100644
index ce28e188adbe..000000000000
--- a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur linux-gpib-3.2.21.orig/drivers/gpib/sys/osfuncs.c linux-gpib-3.2.21/drivers/gpib/sys/osfuncs.c
---- linux-gpib-3.2.21/drivers/gpib/sys/osfuncs.c	2015-02-15 00:41:42.320008509 +0000
-+++ linux-gpib-3.2.21/drivers/gpib/sys/osfuncs.c	2015-02-15 00:41:56.320008602 +0000
-@@ -178,7 +178,7 @@
- 
- long ibioctl(struct file *filep, unsigned int cmd, unsigned long arg)
- {
--	unsigned int minor = iminor(filep->f_dentry->d_inode);
-+	unsigned int minor = iminor(file_inode(filep));
- 	gpib_board_t *board;
- 	gpib_file_private_t *file_priv = filep->private_data;
- 	long retval = -ENOTTY;
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
deleted file mode 100644
index 5ba9019bf430..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user
-
-DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="http://linux-gpib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
-	firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
-	https://dev.gentoo.org/~dilfridge/distfiles/${PN}-3.2.21-ctrl-c.patch.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
-
-COMMONDEPEND="
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/docbook-sgml-utils )
-	perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.21-build.patch
-	"${FILESDIR}"/${PN}-3.2.16-perl.patch
-	"${FILESDIR}"/${PN}-3.2.16-reallydie.patch
-	"${WORKDIR}"/${PN}-3.2.21-ctrl-c.patch
-	"${FILESDIR}"/${PN}-3.2.21-build2.patch
-)
-
-pkg_setup () {
-	use perl && perl_set_version
-	use python && python_setup
-	linux-mod_pkg_setup
-
-	if kernel_is -lt 2 6 8; then
-		die "Kernel versions older than 2.6.8 are not supported."
-	fi
-
-	# https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
-	if use pcmcia && kernel_is -ge 2 6 38; then
-		die "pcmcia support is broken on kernels newer 2.6.38"
-	fi
-}
-
-src_prepare () {
-	epatch "${PATCHES[@]}"
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	set_arch_to_kernel
-	econf \
-		$(use_enable isa) \
-		$(use_enable pcmcia) \
-		$(use_enable static) \
-		$(use_enable debug driver-debug) \
-		$(use_enable guile guile-binding) \
-		$(use_enable perl perl-binding) \
-		$(use_enable php php-binding) \
-		$(use_enable python python-binding) \
-		$(use_enable tcl tcl-binding) \
-		$(use_enable doc documentation) \
-		--with-linux-srcdir=${KV_DIR}
-}
-
-src_compile() {
-	set_arch_to_kernel
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	set_arch_to_kernel
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
-		USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} perl-module_src_install
-		cd "${S}" || die
-	fi
-
-	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
-	udev_dorules 99-gpib.rules
-
-	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
-	insinto /etc
-	newins util/templates/gpib.conf gpib.conf
-	newins util/templates/gpib.conf gpib.conf.example
-
-	if use pcmcia; then
-		dodir /etc/pcmcia
-		insinto /etc/pcmcia
-		doins "${S}"/etc/pcmcia/*
-	fi
-
-	if use firmware; then
-		insinto "${FIRM_DIR}"/agilent_82357a
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
-
-		insinto "${FIRM_DIR}"/ni_gpib_usb_b
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
-
-		insinto /usr/share/linux-gpib/hp_82341
-		# do not install precompiled generate_firmware
-		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
-	fi
-}
-
-pkg_preinst () {
-	linux-mod_pkg_preinst
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
-pkg_postinst () {
-	linux-mod_pkg_postinst
-
-	einfo "You need to run the 'gpib_config' utility to setup the driver before"
-	einfo "you can use it. In order to do it automatically you can add to your"
-	einfo "start script something like this (supposing the appropriate driver"
-	einfo "is loaded on the startup):"
-	einfo "		gpib_config --minor 0"
-	einfo ""
-	einfo "To give a user access to the computer's gpib board you will have to add"
-	einfo "them to the group 'gpib' or, you could change the permissions on the device"
-	einfo "files /dev/gpib[0-15] to something you like better, using 'chmod'."
-	einfo ""
-	einfo "Edit /etc/gpib.conf to match your interface board, and any devices you wish"
-	einfo "to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for"
-	einfo "more information."
-	einfo ""
-
-	if use pcmcia; then
-		einfo "For PCMCIA cards:"
-		einfo "All files needed for a PCMCIA board were copied to /etc/pcmcia."
-		einfo "You may wish to edit the options passed to the gpib_config call in the"
-		einfo "/etc/pcmcia/linux-gpib-pcmcia script."
-		einfo "You may need to send a SIGHUP signal to the cardmgr daemon to force it"
-		einfo "to reload the files in /etc/pcmcia (alternatively you could use your"
-		einfo "pcmcia init.d script to restart the cardmgr, or you could just reboot)."
-		einfo "The driver module will be loaded as needed by the cardmgr."
-		einfo ""
-	fi
-
-	if use firmware; then
-		einfo "For Agilent (HP) 82341C and 82341D cards:"
-		einfo "The firmware for these boards is uploaded by passing the appropriate"
-		einfo "firmware file from /usr/share/linux-gpib/hp_82341 directory to"
-		einfo "gpib_config using the -I or --init-data command line option. Example:"
-		einfo "gpib_config --minor 0 --init-data \\"
-		einfo "/usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin"
-		einfo ""
-	fi
-
-	local v
-		for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 3.2.21-r1 ${v}; then
-			ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel"
-			ewarn "interface. You may need to reboot to make sure the newly built driver modules"
-			ewarn "are used (some of the driver modules cannot be unloaded)."
-			ewarn "If you do not do this, every gpib call will just result in an error message."
-			break
-		fi
-	done
-}
diff --git a/sci-mathematics/octave/octave-4.2.0-r3.ebuild b/sci-mathematics/octave/octave-4.2.0-r3.ebuild
index 5deb837be544..32bcf4c71384 100644
--- a/sci-mathematics/octave/octave-4.2.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r3.ebuild
@@ -38,13 +38,15 @@ RDEPEND="
 		media-libs/fontconfig:1.0=
 		>=x11-libs/fltk-1.3:1=[opengl,xft]
 		x11-libs/gl2ps:0=
-		virtual/glu )
+		virtual/glu
+	)
 	openssl? ( dev-libs/openssl:0= )
 	portaudio? ( media-libs/portaudio )
 	postscript? (
 		app-text/epstool
 		media-gfx/pstoedit
-		media-gfx/transfig )
+		media-gfx/transfig
+	)
 	qhull? ( media-libs/qhull:0= )
 	qrupdate? ( sci-libs/qrupdate:0= )
 	gui? (
@@ -63,7 +65,8 @@ RDEPEND="
 		sci-libs/cholmod:0=
 		sci-libs/colamd:0=
 		sci-libs/cxsparse:0=
-		sci-libs/umfpack:0= )
+		sci-libs/umfpack:0=
+	)
 	X? ( x11-libs/libX11:0= )"
 DEPEND="${RDEPEND}
 	gui? ( dev-qt/linguist-tools:5 )
@@ -72,8 +75,10 @@ DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.6.0 )
 	doc? (
 		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost )
+		dev-texlive/texlive-metapost
+	)
 	sys-apps/texinfo
 	dev-util/gperf
 	virtual/pkgconfig"
diff --git a/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild b/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
index 709c79d0ed5d..f96ddf08c7a7 100644
--- a/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.12_p20091015-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pyrex"
diff --git a/sys-devel/lld/lld-4.0.0_rc1.ebuild b/sys-devel/lld/lld-4.0.0_rc1.ebuild
index 3e6dfc9abbe8..cb624392d7a8 100644
--- a/sys-devel/lld/lld-4.0.0_rc1.ebuild
+++ b/sys-devel/lld/lld-4.0.0_rc1.ebuild
@@ -9,7 +9,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils
+inherit cmake-utils python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="http://llvm.org/"
@@ -23,7 +23,7 @@ IUSE="test"
 
 RDEPEND="~sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}
-	test? ( ~dev-python/lit-${PV} )"
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
 
 S=${WORKDIR}/${P/_/}.src
 
@@ -33,6 +33,14 @@ RESTRICT="test"
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_unpack() {
 	default
 
diff --git a/sys-devel/lld/lld-9999.ebuild b/sys-devel/lld/lld-9999.ebuild
index 93b234c1a920..b4f23d3031e8 100644
--- a/sys-devel/lld/lld-9999.ebuild
+++ b/sys-devel/lld/lld-9999.ebuild
@@ -9,7 +9,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="http://llvm.org/"
@@ -24,14 +24,19 @@ IUSE="test"
 
 RDEPEND="~sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}
-	test? ( ~dev-python/lit-${PV} )"
-
-# TODO: fix test suite to build stand-alone
-RESTRICT="test"
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
 
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_unpack() {
 	if use test; then
 		# needed for patched gtest
diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
index 65d95f8fc978..de5fec84a48e 100644
--- a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/87"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 48d92bee650e..4bc6bb698e00 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -13,5 +13,8 @@ DIST genpatches-4.9-7.extras.tar.xz 17300 SHA256 ba08353081cf07a73fb2a5b998c8dad
 DIST genpatches-4.9-8.base.tar.xz 215420 SHA256 4bbde563b43389798188b75c7e65412aaf5300348efeda63071cbd56f1e275e6 SHA512 12641d4a11a8a4d40f16b9d0c62972de2baadc13481697c69a91a2b36844293f4edf207491ae087ce3378bdd0400856070e353c291f34d1cad02d3e3a6c73a36 WHIRLPOOL 98d63bb42729eb8518c6ea4a15cee2a41fe59a9f299bdde9ce86825bd3c563665a95da841b06817e3a4616fd38592737ad502173aa33a0b9eacd3fb31a42956d
 DIST genpatches-4.9-8.experimental.tar.xz 105608 SHA256 217098bec005a1410b2dc1435841c2fc96d9f6022dd2973512d1b0f36e3c20d5 SHA512 69546bc1d846697179aa287a4d1b708b962c0cdcf14b16acb4c696e8ffa38983a679d0f28c2d5df68046c68cc655add1c54c97bfa22f5867d9bba93612e67e2b WHIRLPOOL 7fddabf8821a18607f765948457a44c689b3c527f2f630f1c3af614c8ba244663ed5d03dbaa5af27885d2d708069fa5f94b1c19aa23512806714522973371a59
 DIST genpatches-4.9-8.extras.tar.xz 17300 SHA256 ba08353081cf07a73fb2a5b998c8dadeb94f6ede09ac177f2357925de9f50dd4 SHA512 18ab24c59adc73bab4a49bc5537333ac6a7d11801afce8943ef42878d8b33341648b64d9fbc56be3a49fe6d9ec7728186eb40a348eedfb0b14ee1f5746e0ab4b WHIRLPOOL b352654885c3180a5599bc0a0acc3f9a3828d75ca5ef4a83c49258ca263822b02d974e273071bf913c82a919c4cdbc9283cee9b81edbc40ce640c11f7ad0775d
+DIST genpatches-4.9-9.base.tar.xz 231952 SHA256 30ca230d4187daba12ed92a55f4b2aa6365bd4d59c54fed2059421b4c6710762 SHA512 94ed25ce3341080c685731ec22b3d009b2daa5a23fc81bfdf9aca1e182c72dc6f03dec0cff1040c1cdc85fddae5a6797b55a9a9fe948ad7de4c41d0349df3b4d WHIRLPOOL dac87de960637bab4b5c61179edcb82350ae6da9d51bed50560b0a471a34f4e426e4dae753aa0aaa99be6ea286c2254d39c03bd1ceac819fd95fdbfd8fdcc389
+DIST genpatches-4.9-9.experimental.tar.xz 105636 SHA256 4b4d821a38ba8023c3967ccffb0b8f81906d44600a35ddf3012b02086bf4e9d3 SHA512 a5e5209607fa265b8dbca81f7f88fdbcd1a79e901598bba1b843c147978cc4deb74371cfad134631a47c403000a5d37882fb4373504dbdc53ef224f8edbbb7e5 WHIRLPOOL 96ff38f611d834b6561cca59ee2d5990b219c94f93fde342e8432d8af0fa4b2ff2648508590614adcbf2299ccc2d2e540281c4559bdef06d8dda7b2e1cca0174
+DIST genpatches-4.9-9.extras.tar.xz 17312 SHA256 635b03e52c3024be184030473f87a350c5a5b5f9d3e81cccf275dda6466261c9 SHA512 3dd41f528e4c8e337378885a40763c495d9972061b190d514c4d4230c7213a15c9fc9e83d54a2b3531d576f4734627cc26d4e144897f834c1d5f4b035c067bd1 WHIRLPOOL fffdbf00315f76648a8f33e27650e86f35193e6db512d5b62e94af77096bbd02de2ac3ca160547e1938e5d2dcca9b76f5489f6ef9844dcfd6c6da41e730ddb5e
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
 DIST patch-4.9-ck1.xz 165624 SHA256 5b9d8f4ef73f87e8595de66ccc38bad86e290fd9453bd536b9cc950f5344b82d SHA512 335f83b8f77c4c2c304db74268eae895ec53611b2cb5ed45a9c6e7f9c7ac37c2eba7cc714d49504ae29cc44c448aa873b52eb332fe91d4e6dbbdd2a175aab252 WHIRLPOOL fdf01a45ad028095d0c91105975724bf19eeb2ddd380f20465357748d3f4a22d73de9fc408473d9d1fb988a6956edcebd0269ff105d3392a82b96e48566aeea5
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.7.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.7.ebuild
new file mode 100644
index 000000000000..2fca1be7f041
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="9"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... ---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+#-- Starting with 4.8, CK patches include BFQ, so exclude genpatches experimental BFQ patches -
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index e830d8215aba..6a93bdd035a4 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,4 @@
-DIST opera-beta_43.0.2442.21_amd64.deb 50419114 SHA256 1e1697282deb323d45b08837aee37d333c780e057f165cefa7c448cb7a2f1f87 SHA512 e52a2a37403399948a38d1124b8dcd31abdd2bc0aa2581fd0d85c27d2a957c2b56189bc476fe5c595678ef4db4c9fb1d516362536b6862db2d0e6fb89b7aa5a2 WHIRLPOOL bdfd82665d2bd66cbd28a76ff30689b173d886bc417f55964d07ee8249d42ecadee457b52e0adb9122e28fb6a1043399f324a12e85992a68fa7d468291091299
-DIST opera-beta_43.0.2442.21_i386.deb 52042650 SHA256 4b891e265bb19e0d3a2f71ae53c0f7c13ee69ebce8e8f3accfcf89874231d392 SHA512 f29de8f33e43339e8125522b6b93ea5e50a1b5f77adb64a6040b01474d60a0c9e3a93ba43edec7f0e24a218df72bf452d66ccc5f8c6199c9cd50e46637c8e845 WHIRLPOOL ec29c05f2e3198fc365bd6189a48bcbda19fb3ae4f57616fba7c0a0717b74150b3053b52a7fd584dbd49a5a9a475b00ea86a667362bdeff3d6201dd27ee2c43a
 DIST opera-beta_43.0.2442.52_amd64.deb 50735048 SHA256 90727982476961e2339eb0e8d19208de32ace5e68ad19baf4f0af62e0061d3e6 SHA512 a2d5f5c3dc1524cda3b005c9ed8abd128057756cd22be8860a3aa23320c44a5996120d0257c25758cccf92d1a9abe6a66a71ab457aa16a137f452dc38ab73bb6 WHIRLPOOL c9a08c070e56f92edaeb4446c8747dbd49bc84d5a7af4633842eb66675be1f501d7d16f7c17d062e35c678c9dce25bd1ba9200e64ea3500c485f9ef95756a078
 DIST opera-beta_43.0.2442.52_i386.deb 51821350 SHA256 092039283abcf20a27802bb9bfecdbe18dd26aa0d1b6767c43af3b487a5b121f SHA512 6440c9e172ff964d666795bf3550268a73d38ae4784ff391af09e2edfe3f8b86d1aab332035385035e50dc5aaa8b7ea18319745d1b6867863de3536a94cb5928 WHIRLPOOL c5864b96abe8ba9ef250f7ae7bf180d4b75271f279f15241c28f3b81f937afe78a338af177518beef0d02556d9e331f2fc2856e13da2e27dd1440843aeafa110
+DIST opera-beta_43.0.2442.686_amd64.deb 50199250 SHA256 8682ce175b855b7a4404fb32a9b78483deff7b1cedff5ae1bf663ea0d2e79e2e SHA512 b2761b1f67db07a0cee548020723a08e61777c3ceddaef9398317f71e1e0405ebc8a61e43fd60e4e07281bdded05340e7e5ac914c56006e7e702f0ac8a9ac762 WHIRLPOOL 3621b652303ee781a847efd52736cda4033f1910eaf53810eea0871b1eaeba73d2fc705e25cecb2d24c18e54d5bb148aa9298f6042b67e3daea17bf854a5ff2f
+DIST opera-beta_43.0.2442.686_i386.deb 51804696 SHA256 208dacbacd3b65e441a6612cd23683d8aaa5e74575e687d03bd64cf1deec675b SHA512 57d83c1d79e26d71ffb909ec3f44d0875de65b69c4c924c80c79574b1a501188235c1c731c6b5335b9d869f706d70bf090f24dc58abd6a476153c6b320481939 WHIRLPOOL 5d3a358220bcee9b68be747d4f0c261ef44ae9269f7351deda61c9e4603adf6424f2bb1485ff87599254d06bd88304ecb190962378bfb4a9090a04ad4ecc31d2
diff --git a/www-client/opera-beta/opera-beta-43.0.2442.21.ebuild b/www-client/opera-beta/opera-beta-43.0.2442.686.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-43.0.2442.21.ebuild
rename to www-client/opera-beta/opera-beta-43.0.2442.686.ebuild