diff --git a/app-admin/conky/conky-1.10.4.ebuild b/app-admin/conky/conky-1.10.4.ebuild
index a660756b02e8..ab4f01482e9c 100644
--- a/app-admin/conky/conky-1.10.4.ebuild
+++ b/app-admin/conky/conky-1.10.4.ebuild
@@ -74,6 +74,8 @@ CONFIG_CHECK=~IPV6
 
 DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 
+PATCHES=( "${FILESDIR}"/${P}-x11-build.patch )
+
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
 To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
new file mode 100644
index 000000000000..eb113a47fd57
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.4-x11-build.patch
@@ -0,0 +1,31 @@
+From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
+From: shizeeg <shizeeque@gmail.com>
+Date: Thu, 8 Sep 2016 18:24:29 +0300
+Subject: [PATCH] Fix build without X11 (#317)
+
+---
+ src/conky.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 0a812fc..4c5da94 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
+ 
+ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
+ {
++#ifndef BUILD_X11
++	static int cur_x, cur_y;	/* current x and y for drawing */
++#endif
+ #ifdef BUILD_X11
+ 	int font_h = 0;
+ 	int cur_y_add = 0;
+@@ -1934,6 +1937,7 @@ static void draw_text(void)
+ 
+ static void draw_stuff(void)
+ {
++	static int text_offset_x, text_offset_y; /* offset for start position */
+ 	text_offset_x = text_offset_y = 0;
+ #ifdef BUILD_IMLIB2
+ 	cimlib_render(text_start_x, text_start_y, window.width, window.height);
diff --git a/app-admin/keepassx/keepassx-2.0.2-r1.ebuild b/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..519898f9c73e
--- /dev/null
+++ b/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot xdg
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qttest:4
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(CHANGELOG)
+
+src_prepare() {
+	xdg_src_prepare
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	xdg_pkg_preinst
+}
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_pkg_postrm
+}
diff --git a/app-admin/lib_users/lib_users-0.9-r1.ebuild b/app-admin/lib_users/lib_users-0.9-r1.ebuild
new file mode 100644
index 000000000000..c38e9844aeb6
--- /dev/null
+++ b/app-admin/lib_users/lib_users-0.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit python-r1
+
+DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
+HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
+SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+	python_foreach_impl nosetests --verbosity=2
+}
+
+src_install() {
+	python_foreach_impl python_newscript lib_users.py lib_users
+	dodoc README TODO
+}
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 2a54169659ee..c53804f07120 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,2 +1 @@
-DIST paxtest-0.9.14.tar.gz 34286 SHA256 7dead81fcdc8db2f88e3da1027e6d7c93596f2e6e4dac25ec9b54c41fa808048 SHA512 6e2d642e1dfe7e3381ed520956d2f5b19ad8c8e569c4ddcf43a2772a76ed67701bb18fe55d7fe2b82ff50644f92470622243ac974083d87448f560f6d48d8727 WHIRLPOOL bef2998611b0487590364648b8f5d4ddc470b212c2a8b0282f4220b1da8033f23299298b51dc932c35f37099f7076a99220726b30d91472ca266042f16c4ed02
 DIST paxtest-0.9.15.tar.gz 37929 SHA256 d553848431fd8c2ab6c8361b62e5cedfed1cc1d60088241f4a33d2af15dd667f SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487 WHIRLPOOL db58265b8140209bb253f05de912bcd4017c06bd99e6b8247f052b93081f98b88b04030b4539993a9f180969722e9d4958f929bd8a0395a027ff4e7a25b48f26
diff --git a/app-admin/paxtest/paxtest-0.9.14.ebuild b/app-admin/paxtest/paxtest-0.9.14.ebuild
deleted file mode 100644
index 10fbe283010a..000000000000
--- a/app-admin/paxtest/paxtest-0.9.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="PaX regression test suite"
-HOMEPAGE="http://pax.grsecurity.net"
-SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/paxctl"
-
-# EI_PAX flags are not strip safe.
-RESTRICT="strip"
-
-QA_EXECSTACK="usr/bin/${PN}
-	usr/$(get_libdir)/${PN}/getamap
-	usr/$(get_libdir)/${PN}/shlibtest2.so
-	usr/$(get_libdir)/${PN}/execheap
-	usr/$(get_libdir)/${PN}/mprotstack
-	usr/$(get_libdir)/${PN}/mprotdata
-	usr/$(get_libdir)/${PN}/mprotheap
-	usr/$(get_libdir)/${PN}/randshlib
-	usr/$(get_libdir)/${PN}/randmain1
-	usr/$(get_libdir)/${PN}/getshlib
-	usr/$(get_libdir)/${PN}/randheap2
-	usr/$(get_libdir)/${PN}/rettofunc2x
-	usr/$(get_libdir)/${PN}/shlibdata
-	usr/$(get_libdir)/${PN}/shlibbss
-	usr/$(get_libdir)/${PN}/getmain1
-	usr/$(get_libdir)/${PN}/execdata
-	usr/$(get_libdir)/${PN}/execstack
-	usr/$(get_libdir)/${PN}/rettofunc2
-	usr/$(get_libdir)/${PN}/mprotshdata
-	usr/$(get_libdir)/${PN}/getstack1
-	usr/$(get_libdir)/${PN}/randamap
-	usr/$(get_libdir)/${PN}/rettofunc1x
-	usr/$(get_libdir)/${PN}/getheap2
-	usr/$(get_libdir)/${PN}/getheap1
-	usr/$(get_libdir)/${PN}/randheap1
-	usr/$(get_libdir)/${PN}/getstack2
-	usr/$(get_libdir)/${PN}/getmain2
-	usr/$(get_libdir)/${PN}/rettofunc1
-	usr/$(get_libdir)/${PN}/randstack2
-	usr/$(get_libdir)/${PN}/mprotshbss
-	usr/$(get_libdir)/${PN}/randstack1
-	usr/$(get_libdir)/${PN}/mprotanon
-	usr/$(get_libdir)/${PN}/randmain2
-	usr/$(get_libdir)/${PN}/writetext
-	usr/$(get_libdir)/${PN}/mprotbss
-	usr/$(get_libdir)/${PN}/anonmap
-	usr/$(get_libdir)/${PN}/execbss
-	usr/$(get_libdir)/${PN}/shlibtest.so"
-
-src_prepare() {
-	mv Makefile.psm Makefile
-	epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
-	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
-	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-}
-
-src_compile() {
-	emake RUNDIR=/usr/$(get_libdir)/paxtest || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
-
-	newman debian/manpage.1.ex paxtest.1 || die
-	dodoc ChangeLog README || die
-}
diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
new file mode 100644
index 000000000000..fba18a276d67
--- /dev/null
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="PaX regression test suite"
+HOMEPAGE="http://pax.grsecurity.net"
+SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/paxctl"
+
+# EI_PAX flags are not strip safe.
+RESTRICT="strip"
+
+src_prepare() {
+	mv Makefile.psm Makefile
+	epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
+	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
+	eapply_user
+}
+
+src_compile() {
+	emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
+
+	newman debian/manpage.1.ex paxtest.1 || die
+	dodoc ChangeLog README || die
+}
diff --git a/app-admin/paxtest/paxtest-0.9.15.ebuild b/app-admin/paxtest/paxtest-0.9.15.ebuild
deleted file mode 100644
index 473de0f99572..000000000000
--- a/app-admin/paxtest/paxtest-0.9.15.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="PaX regression test suite"
-HOMEPAGE="http://pax.grsecurity.net"
-SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/paxctl"
-
-# EI_PAX flags are not strip safe.
-RESTRICT="strip"
-
-QA_EXECSTACK="usr/bin/${PN}
-	usr/$(get_libdir)/${PN}/getamap
-	usr/$(get_libdir)/${PN}/shlibtest2.so
-	usr/$(get_libdir)/${PN}/execheap
-	usr/$(get_libdir)/${PN}/mprotstack
-	usr/$(get_libdir)/${PN}/mprotdata
-	usr/$(get_libdir)/${PN}/mprotheap
-	usr/$(get_libdir)/${PN}/randshlib
-	usr/$(get_libdir)/${PN}/randmain1
-	usr/$(get_libdir)/${PN}/getshlib
-	usr/$(get_libdir)/${PN}/randheap2
-	usr/$(get_libdir)/${PN}/rettofunc2x
-	usr/$(get_libdir)/${PN}/shlibdata
-	usr/$(get_libdir)/${PN}/shlibbss
-	usr/$(get_libdir)/${PN}/getmain1
-	usr/$(get_libdir)/${PN}/execdata
-	usr/$(get_libdir)/${PN}/execstack
-	usr/$(get_libdir)/${PN}/rettofunc2
-	usr/$(get_libdir)/${PN}/mprotshdata
-	usr/$(get_libdir)/${PN}/getstack1
-	usr/$(get_libdir)/${PN}/randamap
-	usr/$(get_libdir)/${PN}/rettofunc1x
-	usr/$(get_libdir)/${PN}/getheap2
-	usr/$(get_libdir)/${PN}/getheap1
-	usr/$(get_libdir)/${PN}/randheap1
-	usr/$(get_libdir)/${PN}/getstack2
-	usr/$(get_libdir)/${PN}/getmain2
-	usr/$(get_libdir)/${PN}/rettofunc1
-	usr/$(get_libdir)/${PN}/randstack2
-	usr/$(get_libdir)/${PN}/mprotshbss
-	usr/$(get_libdir)/${PN}/randstack1
-	usr/$(get_libdir)/${PN}/mprotanon
-	usr/$(get_libdir)/${PN}/randmain2
-	usr/$(get_libdir)/${PN}/writetext
-	usr/$(get_libdir)/${PN}/mprotbss
-	usr/$(get_libdir)/${PN}/anonmap
-	usr/$(get_libdir)/${PN}/execbss
-	usr/$(get_libdir)/${PN}/shlibtest.so"
-
-src_prepare() {
-	mv Makefile.psm Makefile
-	epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
-	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
-	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-}
-
-src_compile() {
-	emake RUNDIR=/usr/$(get_libdir)/paxtest || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
-
-	newman debian/manpage.1.ex paxtest.1 || die
-	dodoc ChangeLog README || die
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index ec8feffe0241..ade4dc6a392b 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1,4 @@
 DIST puppetserver-2.3.2.tar.gz 33673099 SHA256 81e92875c07f73e636143405804f1214f31f0f840d521f03289d93bd7b2a0899 SHA512 3ab750128bd11d1e3d9815a1c9907fc81b673281ec21def56318557c134635bca0418ed445d090da6257da9dd64e65a9c2b9e82257868d5a895459c7458cc731 WHIRLPOOL 55b679e1eed246ad10bea4f973ca51f65b50b2bf112a6d90d8bda600a1d0e4c09abf74756851a4844cf68705d1b94b9f80f688f1523813d9fe14fbc4424d14e0
 DIST puppetserver-2.4.0.tar.gz 33822659 SHA256 81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4 SHA512 c9afab58bb2f432874d302cb63fb213ead561e2bcecc44f776be49dc09eb86deda3019eae1bddb7369bb7bdc1a3d82f47f6053d526b2b28b189358a2bdded852 WHIRLPOOL 079186ecd239a1be1dde847b23a5fe1bc4dedc543b510f2197cd776bc59f943166d3f403727e1cc0ac0232a8519a36944cb4e6ec6bb6bfdc0e822405c4b7fd96
 DIST puppetserver-2.5.0.tar.gz 33907947 SHA256 d058d49133b3adba86c8b01c7ab5c1f4511c191fd50e75be583b28ddfc824cd5 SHA512 c822d320a9ce98c6e96e4838770fc52760f08aab9fee26e62174762947b9ccb09234cb1edba0a5e17f4c08e76adccec83d8353f5aa47d08864c5bb9b2dab2574 WHIRLPOOL 1d2fde7aade7e9e6c5117d8d2c88d787a93d1aacdea81ad3235fdb90384d8578739a54ccfcff28e217a86bd5d29c48c4dbbea4d38d3e34c4099ecf21adc9f995
+DIST puppetserver-2.6.0.tar.gz 34157248 SHA256 633ad9d1a4da7fa514edd7be6501aa61f779b50e7ec40aeedbc955175945f771 SHA512 3702321a99d8e9f528e2457ceb7bff513619db31687c54884fcf9b47626b680628879b65488c3cad45fa5b3b1d0af9967e40adf1c313b7eb6e0de8c8697af659 WHIRLPOOL d63c3579b4a9f6de94b44d526489509efd7b420bc6fcd4d8ba8c57a7d3d31a209a94b919143f90426a0151224c77ba694d22530cb98169dc94f0b4548d3bb2ba
diff --git a/app-admin/puppetserver/puppetserver-2.6.0.ebuild b/app-admin/puppetserver/puppetserver-2.6.0.ebuild
new file mode 100644
index 000000000000..5f234011af87
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-2.6.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.7.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# init type tasks
+	newconfd ext/default puppetserver
+	newinitd "${FILESDIR}/puppetserver.initd" puppetserver
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	newins ext/default gentoo.conf
+	systemd_dounit ext/redhat/puppetserver.service
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 717c19e2b702..2d46956bda89 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -5,3 +5,4 @@ DIST salt-2015.8.12.tar.gz 7033938 SHA256 712f72b30a9555ea46a51bc677e05ffa2eefae
 DIST salt-2015.8.8.tar.gz 6982904 SHA256 b2ecce7bf562cfcd6586d66ade278f268bb89023f0fa0accaa55f90b8a668ef5 SHA512 add65951694bc9e3aaa6db69bf9ac7ed32a5c42822ae34281ca3ea1e7f393235cd6baa1905362d177c62505a514e1c4599751e1a8a913cc334f9ebe1d4ab7ed3 WHIRLPOOL 9d81b6153019ff0862c6ee0e3fa949810e8066798aabcc94f2b87893f51906e0e19e37aa26023ea578eb10ebb9816d30d12104fdc5018c7ce91790bd617b2bba
 DIST salt-2016.3.1.tar.gz 7932479 SHA256 e6bdba4693116430c2af57497eb63399e3a139ac0a7016fa0870b49fbe987f75 SHA512 74122020a83df79171b9aa3bc311d1b16930140ec6b063c888d41e10fb8e696f69188b62cf925045b40d8b8fe713759de08978b08bc3b8e1f12722de3a8ddb7b WHIRLPOOL f76afb4d9c6678edf48b608f6dbd27201656fd371b0df78a8a8db306a2cbf5b08fa2fd916e9fb5409b67cd05ab007a3684d91c1e0158416b12f014001de1506a
 DIST salt-2016.3.2.tar.gz 8014793 SHA256 6a84b724d02b0dba438dea57650724064675d82620e66749bd2fe8f21da71be0 SHA512 608e2a43bc8c55eeb8c9e0f9207306e591151940ad1ffb869ada12963c0790f37653936e539c0b70439c13180909de2c763db6c30e7f9e2087068985d1b3ff91 WHIRLPOOL 5e6f6dc9980ab6cd6e8c897d140241ce9e6dec8afd08274749a20260c6b871d6e52cd674ed8e838a4aa285bf45c49586d77bc2156f94ee26f4f776d9025040eb
+DIST salt-2016.3.3.tar.gz 7952361 SHA256 5906038594f1b9b3ac41714774fbd78f0af80d2f3ffe1c1bf20308032d7d52b6 SHA512 46a8f8b3213e4cc02eaed95e7fc28ce224fe07fe2aea39b68ff3e97043021951558f04690f7043510c8dfb62d76fe82192d67de6151c7f1076a23c0f8d796c9e WHIRLPOOL dc21ca7d996b5f59501e4658a38fee8d1bdd20669059b72781a4e7e4c91b2fc40f267a533f6974c26a70b4dd8ac20d93174d1a8d9c04d351af0a47dc53572379
diff --git a/app-admin/salt/files/salt-2016.3.3-broken-tests.patch b/app-admin/salt/files/salt-2016.3.3-broken-tests.patch
new file mode 100644
index 000000000000..8260f34c8102
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.3-broken-tests.patch
@@ -0,0 +1,56 @@
+diff --git a/tests/unit/modules/boto_lambda_test.py b/tests/unit/modules/boto_lambda_test.py
+index 01ca245..722915b 100644
+--- a/tests/unit/modules/boto_lambda_test.py
++++ b/tests/unit/modules/boto_lambda_test.py
+@@ -626,18 +626,6 @@ class BotoLambdaEventSourceMappingTestCase(BotoLambdaTestCaseBase, BotoLambdaTes
+                                           **conn_parameters)
+         self.assertTrue(result['deleted'])
+ 
+-    @skipIf(ON_SUSE, 'Skipping while debugging why the test suite hangs and bails on this test on opensuse')
+-    def test_that_when_deleting_an_event_source_mapping_by_name_succeeds_the_delete_event_source_mapping_method_returns_true(self):
+-        '''
+-        tests True mapping deleted.
+-        '''
+-        self.conn.list_event_source_mappings.return_value = {'EventSourceMappings': [event_source_mapping_ret]}
+-        result = boto_lambda.delete_event_source_mapping(
+-                             EventSourceArn=event_source_mapping_ret['EventSourceArn'],
+-                             FunctionName=event_source_mapping_ret['FunctionArn'],
+-                             **conn_parameters)
+-        self.assertTrue(result['deleted'])
+-
+     def test_that_when_deleting_an_event_source_mapping_without_identifier_the_delete_event_source_mapping_method_raises_saltinvocationexception(self):
+         '''
+         tests Deleting a mapping without identifier
+diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
+index 9d2fa3a..710bbd7 100644
+--- a/tests/unit/modules/inspect_collector_test.py
++++ b/tests/unit/modules/inspect_collector_test.py
+@@ -36,28 +36,6 @@ class InspectorCollectorTestCase(TestCase):
+         self.assertEqual(inspector.dbfile, '/foo/cache/_minion_collector.db')
+         self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
+ 
+-    def test_file_tree(self):
+-        '''
+-        Test file tree.
+-
+-        :return:
+-        '''
+-
+-        inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
+-        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
+-        expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
+-                         ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
+-                         ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
+-                          '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
+-        tree_result = []
+-        for chunk in inspector._get_all_files(tree_root):
+-            buff = []
+-            for pth in chunk:
+-                buff.append(pth.replace(tree_root, ''))
+-            tree_result.append(buff)
+-        tree_result = tuple(tree_result)
+-        self.assertEqual(expected_tree, tree_result)
+-
+     def test_get_unmanaged_files(self):
+         '''
+         Test get_unmanaged_files.
diff --git a/app-admin/salt/salt-2016.3.3.ebuild b/app-admin/salt/salt-2016.3.3.ebuild
new file mode 100644
index 000000000000..ba64cbc3ab3e
--- /dev/null
+++ b/app-admin/salt/salt-2016.3.3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.2-broken-tests.patch"
+	"${FILESDIR}/${PN}-2016.3.3-broken-tests.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+
+	# apparently libcloud does not know about this?
+	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+	rm tests/unit/cloud/clouds/gce_test.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-arch/engrampa/engrampa-1.10.2-r1.ebuild b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..c8a2bf220656
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Engrampa archive manager for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="caja magic"
+
+RDEPEND=">=x11-libs/gtk+-2.24.0:2
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.10:0 )
+	magic? ( sys-apps/file )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35:*
+	>=mate-base/mate-common-1.8:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop DEPRECATED flags as configure option doesn't do it, bug #385453
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		copy-n-paste/Makefile.am copy-n-paste/Makefile.in || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-packagekit \
+		--disable-deprecations \
+		--with-gtk=2.0 \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic)
+}
+
+DOCS="AUTHORS HACKING MAINTAINERS NEWS README TODO"
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog ""
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format supported install the relevant package."
+	elog
+	elog "For example:"
+	elog "  7-zip   : emerge app-arch/p7zip"
+	elog "  ace     : emerge app-arch/unace"
+	elog "  arj     : emerge app-arch/arj"
+	elog "  cpio    : emerge app-arch/cpio"
+	elog "  deb     : emerge app-arch/dpkg"
+	elog "  iso     : emerge app-cdr/cdrtools"
+	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
+	elog "  lha     : emerge app-arch/lha"
+	elog "  lzma    : emerge app-arch/xz-utils"
+	elog "  lzop    : emerge app-arch/lzop"
+	elog "  rar     : emerge app-arch/unrar"
+	elog "  rpm     : emerge app-arch/rpm"
+	elog "  unstuff : emerge app-arch/stuffit"
+	elog "  zoo     : emerge app-arch/zoo"
+}
diff --git a/app-arch/engrampa/engrampa-1.12.0.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
similarity index 92%
rename from app-arch/engrampa/engrampa-1.12.0.ebuild
rename to app-arch/engrampa/engrampa-1.12.0-r1.ebuild
index c1ec89763d9b..89cfca9f8ac2 100644
--- a/app-arch/engrampa/engrampa-1.12.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
@@ -32,11 +32,16 @@ RDEPEND="
 	!!app-arch/mate-file-archiver"
 
 DEPEND="${RDEPEND}
+	app-text/yelp-tools
 	>=dev-util/intltool-0.50.1:*
-	dev-util/itstool:0
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
+	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
+)
+
 src_configure() {
 	mate_src_configure \
 		--disable-run-in-place \
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
new file mode 100644
index 000000000000..d0937a8959c5
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
@@ -0,0 +1,25 @@
+From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Thu, 24 Dec 2015 17:11:19 +0300
+Subject: [PATCH] 7z: correct checking for p7zip 15.09+
+
+from https://github.com/GNOME/file-roller/commit/ed9c3fd2
+
+fixes https://github.com/mate-desktop/engrampa/issues/114
+---
+ src/fr-command-7z.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index 297ba1b..0b784f7 100644
+--- a/src/fr-command-7z.c
++++ b/src/fr-command-7z.c
+@@ -106,7 +106,7 @@ list__process_line (char     *line,
+ 			strncpy (version, ver_start, ver_len);
+ 			version[ver_len] = 0;
+ 
+-			if (strcmp (version, "4.55") < 0)
++			if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
+ 				p7z_comm->old_style = TRUE;
+ 			else
+ 				p7z_comm->old_style = FALSE;
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
new file mode 100644
index 000000000000..4e25898949f0
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
@@ -0,0 +1,30 @@
+From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001
+From: sc0w <scow@riseup.net>
+Date: Wed, 25 May 2016 02:29:21 +0200
+Subject: [PATCH] p7zip-rar 15.14 supported
+
+since 15.14, p7zip-rar uses the plugin Rar.so to handle archives
+
+It can find on /usr/lib/ or /usr/libexec/
+
+If someone has it in another folder, we can add it
+
+Fixes #136
+---
+ src/fr-command-7z.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index 20cfa2c..a7d032e 100644
+--- a/src/fr-command-7z.c
++++ b/src/fr-command-7z.c
+@@ -599,7 +599,8 @@ fr_command_7z_get_capabilities (FrCommand  *comm,
+ 		if (is_mime_type (mime_type, "application/x-rar")
+ 		    || is_mime_type (mime_type, "application/x-cbr"))
+ 		{
+-			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
++			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS)
++			    || g_file_test ("/usr/libexec/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS))
+ 				capabilities |= FR_COMMAND_CAN_READ;
+ 		}
+ 		else
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index f0eb7ceaad37..04a26c505f0a 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -2,3 +2,4 @@ DIST dar-2.4.20.tar.gz 1804634 SHA256 f0f66108692de8b27e76b1832d9013d9d1dbf45d2a
 DIST dar-2.4.22.tar.gz 1802561 SHA256 19a977e3ca7ed15e4406bb3e08ff2b8225d291a5c4189a6d5b7b3d75eea50f2b SHA512 1eb809e6388be7e0c11961b1cd84712e5a94ff5fcbfd4fb66ed5a9aa23e01e7b99ba7300491ea383517b99af289c2d2bb9eab904c0511f23610bbb8feee4575c WHIRLPOOL 6156344a471ae23afae6b58e9bbb030a1d829425c086561843a388873cb5003ea09ec1fdd11245bad2e12a40cc10155e490bef1ef68de5ad9915a5f51f98f93a
 DIST dar-2.4.9.tar.gz 1751738 SHA256 3d11159a290886dde968e16d36f32fa8640029708457bc87cc0da6d0eac71643 SHA512 9a9b972599747493694fd838bafaa690e70490b5c500f084f0d0225e93a54ce40d61bc495827519c88f6a94542b88a1be5d11e5a98e672abe8659364d1b4c51f WHIRLPOOL f700bf7bd393e6dc2cce11e7bc56af0f130ea3fb714de04617a940ec15d6174c06b7a1051eb9c6ffa7a0ec686b1f13c288af1b541d49b332932743d0d617b56b
 DIST dar-2.5.5.tar.gz 1861378 SHA256 aa77d6778206b00ad7b37d5f615aafff3ea770b35d96625429c14ff67b78466d SHA512 202f1b35a4b74d60215768deffe24b745bba699b880dd4228dff3a983cbfdcd6e5f739cf81073d937d793f188f44339cfeb712e2874533b01cce49b0a451c306 WHIRLPOOL fccac49a2f52adafb226c77f3ba0418fbcbe913fb80646e873a206f5d44cd693bd2be5f4dc1839957019ee500d70cd5a272e86a21ce1774d6d17ceeb3d7cd5e0
+DIST dar-2.5.6.tar.gz 1879556 SHA256 47db04275d9f10f3a074e226d6fe760184e9694f1811a98f0b41e4f1dee30815 SHA512 cb707e7f95917de6eb0d221effe380d75abf49cd28bd97dd4a9056032f465aba5ee02eca08554fd5154bc4664946564723a6defa7d5d9cc4d9e62fe690e2095e WHIRLPOOL e9930b21b2d319b3df6e5f0bd1b19e4900b5863232a682b62c4324f13eafdb74e530ca8dc3b92801758f7facb1d20a21706cbbaa4436ac5a2a8ff163d582660c
diff --git a/app-backup/dar/dar-2.5.6.ebuild b/app-backup/dar/dar-2.5.6.ebuild
new file mode 100644
index 000000000000..6986739f195d
--- /dev/null
+++ b/app-backup/dar/dar-2.5.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit confutils flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks (floppy,CDR(W),DVDR(W),zip,jazz etc.)"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		xattr? ( sys-apps/attr:= )
+	)
+	lzo? ( !static? ( dev-libs/lzo:= ) )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	local myconf=( --disable-upx )
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	use xattr || myconf+=( --disable-ea-support )
+	use dar32 && myconf+=( --enable-mode=32 )
+	use dar64 && myconf+=( --enable-mode=64 )
+	use doc || myconf+=( --disable-build-html )
+	# use examples && myconf+=( --enable-examples )
+	use gcrypt || myconf+=( --disable-libgcrypt-linking )
+	use gpg || myconf+=( --disable-gpgme-linking )
+	use lzo || myconf+=( --disable-liblzo2-linking )
+	use nls || myconf+=( --disable-nls )
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		prune_libtool_files --all
+	fi
+}
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index d02c45be5951..0d8cca6996ac 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
+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
diff --git a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
new file mode 100644
index 000000000000..815d376bfab4
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-2
+	SRC_URI=""
+else
+	MY_P="${P}-v${PV}"
+	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi +dialogs"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:= )
+	>=sys-apps/pcsc-lite-1.2.9
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )
+	!app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
+
+	if [[ ${PV} == "9999" ]] ; then
+		# 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
+	fi
+
+	if [[ ${PV} == "9999" ]] || ! use gtk ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		--with-gnu-ld \
+		--disable-static \
+		--disable-signed
+}
+
+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"
+		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"
+		fi
+	fi
+	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
+}
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index cf09a3d5a260..3575da909a90 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -1 +1,2 @@
 DIST csharp-mode-0.7.0.tar.bz2 6254 SHA256 e72a17972283691c33080aaa60d8060576d2951f1e374da223cf76468bd2eeec SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9 WHIRLPOOL 58816ec16158adb4de40fe27540a3734813012ecd7f345fc048faa4807d85ecef9617d82e30f945ad7dfb1452ef066a1ed3e38c3e792e43940e23464ba70c552
+DIST csharp-mode-0.9.0.tar.gz 50453 SHA256 4232fe0fc4528be543ca1e338ce3e839814f2a5b43e480c16b7b4f1ea1bca3c5 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef WHIRLPOOL c84d316b0160b092e5d368fc0020e9a05a2616b7da80cb8777dc7a80b7cbc19f79eeb5f112d6541343e468281958db4c3c1ee723c1b8443de93813bd6a636c81
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
new file mode 100644
index 000000000000..abd411d747e3
--- /dev/null
+++ b/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
+HOMEPAGE="https://github.com/josteink/csharp-mode"
+SRC_URI="https://github.com/josteink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp-install ${PN} csharp-mode.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org
+}
diff --git a/app-emacs/desktop+/Manifest b/app-emacs/desktop+/Manifest
new file mode 100644
index 000000000000..82248270921f
--- /dev/null
+++ b/app-emacs/desktop+/Manifest
@@ -0,0 +1 @@
+DIST desktop+-0.2.tar.gz 19596 SHA256 74b1c4115e172e11c658c61f156c6a01fc3b862e7fdba5b3a92e5779dbb78fcf SHA512 3fe0647e506832e37378862d59f5d748f8db20d4ad776d7486ba3393f67047a69f0e5704042eec2e2327ead89b6b2e55196f5773efbe975f5913a6ec6f01269c WHIRLPOOL 18ac8dba3a49e65d0368a9a39b7bfb6fe412f0f641aebec80cc31ad80807c4f08584537c8b23b8c305ba1b0b9ba7dcb41a6ab9867949c7bbeb073be5db505073
diff --git a/app-emacs/desktop+/desktop+-0.2.ebuild b/app-emacs/desktop+/desktop+-0.2.ebuild
new file mode 100644
index 000000000000..f16dccf10541
--- /dev/null
+++ b/app-emacs/desktop+/desktop+-0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="desktop+ extends standard desktop module"
+HOMEPAGE="https://github.com/ffevotte/desktop-plus"
+SRC_URI="https://github.com/ffevotte/desktop-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/dash app-emacs/f"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/desktop-plus-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/desktop+/files/50desktop+-gentoo.el b/app-emacs/desktop+/files/50desktop+-gentoo.el
new file mode 100644
index 000000000000..ca3b3828a3ed
--- /dev/null
+++ b/app-emacs/desktop+/files/50desktop+-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "desktop+-autoloads" nil t)
diff --git a/app-emacs/desktop+/metadata.xml b/app-emacs/desktop+/metadata.xml
new file mode 100644
index 000000000000..57bb313b577e
--- /dev/null
+++ b/app-emacs/desktop+/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>victor@enise.org</email>
+    <name>Victor Gaydov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
new file mode 100644
index 000000000000..3aec0820c359
--- /dev/null
+++ b/app-emacs/f/Manifest
@@ -0,0 +1 @@
+DIST f-0.18.2.tar.gz 18485 SHA256 e5791b653128f6508244a64096526439fcff6b40011b56c07fba552f20d446a4 SHA512 5b11084dcc6afcc85ed0e187f6dd252c391fa43325be5b88b776171b3bc7076ea2bbd32b7c424deb70e035f6acd46acd86053547663502530832db2c50eba346 WHIRLPOOL ef30dda229dba4da6432f5383f0e842132211da9472ab0625933d4421b74d9fa1adbb92654f2a3aacc9797ca312c4aa20b3b9572c7e11fa750ef34a011e1c099
diff --git a/app-emacs/f/f-0.18.2.ebuild b/app-emacs/f/f-0.18.2.ebuild
new file mode 100644
index 000000000000..47d668ffccab
--- /dev/null
+++ b/app-emacs/f/f-0.18.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Modern API for working with files and directories in Emacs"
+HOMEPAGE="https://github.com/rejeep/f.el"
+SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/dash app-emacs/s"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/f.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/f/files/50f-gentoo.el b/app-emacs/f/files/50f-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/f/files/50f-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/f/metadata.xml b/app-emacs/f/metadata.xml
new file mode 100644
index 000000000000..57bb313b577e
--- /dev/null
+++ b/app-emacs/f/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>victor@enise.org</email>
+    <name>Victor Gaydov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
new file mode 100644
index 000000000000..b12c2aa7253e
--- /dev/null
+++ b/app-emacs/s/Manifest
@@ -0,0 +1 @@
+DIST s-1.11.0.tar.gz 46771 SHA256 826d186458f7568f1304bca0c094034a9e7370bd2858dcf806dd513abe2d384f SHA512 364fa7ea875e9be6db464a826c1259889b67d87817b41cff40ab7da80e0bfc3e27dcadadfd005a64a895ee92644c2dea82789bdf1b1fe538501c40f748455608 WHIRLPOOL cccae8d9539dbc91da97e68dd88e13b08bd2ba1a414b62bb431c43dc1f4c8b1e4a8d37996a861d7817763bc08c4fee53dd9a4f8134ba0719f33b6e6f6a4b7496
diff --git a/app-emacs/s/files/50s-gentoo.el b/app-emacs/s/files/50s-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/s/files/50s-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/s/metadata.xml b/app-emacs/s/metadata.xml
new file mode 100644
index 000000000000..57bb313b577e
--- /dev/null
+++ b/app-emacs/s/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>victor@enise.org</email>
+    <name>Victor Gaydov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-emacs/s/s-1.11.0.ebuild b/app-emacs/s/s-1.11.0.ebuild
new file mode 100644
index 000000000000..680b3390c8ed
--- /dev/null
+++ b/app-emacs/s/s-1.11.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="The long lost Emacs string manipulation library"
+HOMEPAGE="https://github.com/magnars/s.el"
+SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/s.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 720bdfd3b997..2a480d4c418f 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -11,3 +11,4 @@ DIST install-crossover-14.1.4.bin 68463678 SHA256 9e51823fca911916755b1edca8673c
 DIST install-crossover-15.0.0.bin 80995834 SHA256 ac538e5568674e23f515b6725bb4cb8b17c516bc910c875d3ac7e45d69f7aff4 SHA512 597262b760c7cfc3c42cdb0b846802c6c47d4fcd5af06b53d0c63c80e4890e14af8ff0eaaac74a08f4f5d55e166a480d199b185efe685f7c42abca3d62fc2a0d WHIRLPOOL 18f5eb531ad32d27e4e2bea1f205593906ab0bcbc022f0963fd237101b26cb796f7f771ab5b7d57b126aea93627390fc55075611551109ad1ad98769a2711951
 DIST install-crossover-15.0.1.bin 81027541 SHA256 ccb222775032711e6d7f3ca5994ebc51cb168cdb9e2599d186b3fb1336ac20fb SHA512 a35188ccebeee8d456e73fdcbb8e8d4f0aff41bb89d92767d2e2e78e7cb25c8e48a150393c1c9abeb9760fbc873314e301c0a364ba27acfe08e0980bb5eedb03 WHIRLPOOL 32396d7be78b6ca975d0eadb753f00c060f731eefee00bd4fbefcf4f96488104f9396632648a14af52976b75bd924325b68c3e7d79da6676bba5207aac5fd045
 DIST install-crossover-15.1.0.bin 80623685 SHA256 def2d9f2bf59ba8779d15f6a63e8e58e60c8e25ffddeeb9446eccf5af72c16f9 SHA512 177e70baff3d99e808834c8e6f626f09d9c262babd6d5a3b51ea79a5a68a157cdfd4fd60ad6939d110f2300670e4973d9fd43a3a132ff9a2367dedb782e5c05c WHIRLPOOL 9a6655d0d3885d36613d0dc07ceaf02f2ee36481492787ca5e4fd59c657026dd62dbc56a09fac9ba1caa40d873e7ecd156c4d5ec22cc9185e242a099a2f4f3c7
+DIST install-crossover-15.2.0.bin 80734561 SHA256 5a677c160afcfb88f1f24ad241a013bf4da430f1d1e6a109965aded298fa52fe SHA512 9633e29b26f8fa99d1c34347b8e1f2e89b84370994a1ab3bba7061b75224f3a907d1c364207312dde1995e5a59180f8699558a96a4c99b157257ab9c21013b2e WHIRLPOOL 0678e8794f31df994b5f02795f07dbf115dc8639deb04ac15f370a107fcccca5707101b6f68ec252ff248f0eaba0139d323ec2033f03880a602b3537b0fd58ae
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
new file mode 100644
index 000000000000..25fde9a5bd5c
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
+RESTRICT="bindist test"
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="opt/cxoffice/lib/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	"
+S="${WORKDIR}"
+
+DEPEND="dev-lang/perl
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-dialup/capi4k-utils )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	media-libs/alsa-lib[abi_x86_32(-)]
+	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} in ${DISTDIR}"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files
+	rm -r license.txt guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym /opt/cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
+		"${ED}usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	einfo "Source code can be obtained from:"
+	einfo
+	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/qemu/files/qemu-2.7.0-CVE-2016-7170.patch b/app-emulation/qemu/files/qemu-2.7.0-CVE-2016-7170.patch
new file mode 100644
index 000000000000..7eb5f76dd133
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.7.0-CVE-2016-7170.patch
@@ -0,0 +1,40 @@
+From: Prasad J Pandit <address@hidden>
+
+When processing svga command DEFINE_CURSOR in vmsvga_fifo_run,
+the computed BITMAP and PIXMAP size are checked against the
+'cursor.mask[]' and 'cursor.image[]' array sizes in bytes.
+Correct these checks to avoid OOB memory access.
+
+Reported-by: Qinghao Tang <address@hidden>
+Reported-by: Li Qiang <address@hidden>
+Signed-off-by: Prasad J Pandit <address@hidden>
+---
+ hw/display/vmware_vga.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
+index e51a05e..6599cf0 100644
+--- a/hw/display/vmware_vga.c
++++ b/hw/display/vmware_vga.c
+@@ -676,11 +676,13 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
+             cursor.bpp = vmsvga_fifo_read(s);
+ 
+             args = SVGA_BITMAP_SIZE(x, y) + SVGA_PIXMAP_SIZE(x, y, cursor.bpp);
+-            if (cursor.width > 256 ||
+-                cursor.height > 256 ||
+-                cursor.bpp > 32 ||
+-                SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask ||
+-                SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image) {
++            if (cursor.width > 256
++                || cursor.height > 256
++                || cursor.bpp > 32
++                || SVGA_BITMAP_SIZE(x, y)
++                    > sizeof(cursor.mask) / sizeof(cursor.mask[0])
++                || SVGA_PIXMAP_SIZE(x, y, cursor.bpp)
++                    > sizeof(cursor.image) / sizeof(cursor.image[0])) {
+                     goto badcmd;
+             }
+ 
+-- 
+2.5.5
+
diff --git a/app-emulation/qemu/qemu-2.7.0-r1.ebuild b/app-emulation/qemu/qemu-2.7.0-r2.ebuild
similarity index 99%
rename from app-emulation/qemu/qemu-2.7.0-r1.ebuild
rename to app-emulation/qemu/qemu-2.7.0-r2.ebuild
index c75b7b6bc05c..d71e077e2739 100644
--- a/app-emulation/qemu/qemu-2.7.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.7.0-r2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -340,6 +340,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-CVE-2016-7156.patch   # bug 593036
 	epatch "${FILESDIR}"/${P}-CVE-2016-7157-1.patch # bug 593038
 	epatch "${FILESDIR}"/${P}-CVE-2016-7157-2.patch # bug 593038
+	epatch "${FILESDIR}"/${P}-CVE-2016-7170.patch   # bug 593284
 
 	# Fix ld and objcopy being called directly
 	tc-export AR LD OBJCOPY
diff --git a/app-emulation/spice/spice-0.12.7-r1.ebuild b/app-emulation/spice/spice-0.12.7-r1.ebuild
index cecdd6ec20ee..568e3cc33d46 100644
--- a/app-emulation/spice/spice-0.12.7-r1.ebuild
+++ b/app-emulation/spice/spice-0.12.7-r1.ebuild
@@ -39,10 +39,6 @@ DEPEND="
 	smartcard? ( app-emulation/qemu[smartcard] )
 	${RDEPEND}"
 
-# Prevent sandbox violations, bug #586560
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 python_check_deps() {
 	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
 	has_version "dev-python/six[${PYTHON_USEDEP}]"
@@ -67,6 +63,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with sasl) \
@@ -74,6 +75,15 @@ src_configure() {
 		--disable-gui
 }
 
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
 src_install() {
 	default
 	use static-libs || prune_libtool_files
diff --git a/app-emulation/spice/spice-0.13.1-r2.ebuild b/app-emulation/spice/spice-0.13.1-r2.ebuild
index 80cf44adb644..0a9437888f8b 100644
--- a/app-emulation/spice/spice-0.13.1-r2.ebuild
+++ b/app-emulation/spice/spice-0.13.1-r2.ebuild
@@ -41,10 +41,6 @@ DEPEND="
 	smartcard? ( app-emulation/qemu[smartcard] )
 	${RDEPEND}"
 
-# Prevent sandbox violations, bug #586560
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 python_check_deps() {
 	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
 	has_version "dev-python/six[${PYTHON_USEDEP}]"
@@ -68,6 +64,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable lz4) \
@@ -76,6 +77,15 @@ src_configure() {
 		--disable-gui
 }
 
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
 src_install() {
 	default
 	use static-libs || prune_libtool_files
diff --git a/app-emulation/spice/spice-0.13.2.ebuild b/app-emulation/spice/spice-0.13.2.ebuild
index 0b41187a95f6..6c589d98a945 100644
--- a/app-emulation/spice/spice-0.13.2.ebuild
+++ b/app-emulation/spice/spice-0.13.2.ebuild
@@ -42,10 +42,6 @@ DEPEND="
 	smartcard? ( app-emulation/qemu[smartcard] )
 	${RDEPEND}"
 
-# Prevent sandbox violations, bug #586560
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 python_check_deps() {
 	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
 	has_version "dev-python/six[${PYTHON_USEDEP}]"
@@ -58,6 +54,11 @@ pkg_setup() {
 # maintainer notes:
 # * opengl support is currently broken
 src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	local myconf="
 		$(use_enable static-libs static)
 		$(use_enable lz4)
@@ -70,6 +71,15 @@ src_configure() {
 	econf ${myconf}
 }
 
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
 src_install() {
 	default
 	use static-libs || prune_libtool_files
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index a5f3f7fe07b5..03da5f143703 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -42,10 +42,6 @@ DEPEND="
 	smartcard? ( app-emulation/qemu[smartcard] )
 	${RDEPEND}"
 
-# Prevent sandbox violations, bug #586560
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 python_check_deps() {
 	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
 	has_version "dev-python/six[${PYTHON_USEDEP}]"
@@ -61,6 +57,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	local myconf="
 		$(use_enable static-libs static)
 		$(use_enable lz4)
@@ -73,6 +74,15 @@ src_configure() {
 	econf ${myconf}
 }
 
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
 src_install() {
 	default
 	use static-libs || prune_libtool_files
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.38.106717.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.38.106717.ebuild
index 7c9e220e242f..9bfa53bf6a9d 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.38.106717.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.38.106717.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils multilib versionator
 
@@ -32,7 +32,7 @@ RDEPEND="~app-emulation/virtualbox-${MAIN_PV}"
 
 S="${WORKDIR}"
 
-QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
 
 src_install() {
 	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.40.110317.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.40.110317.ebuild
index 025a28a1a5f8..945533b5034f 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.40.110317.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.40.110317.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils multilib versionator
 
@@ -32,7 +32,7 @@ RDEPEND="~app-emulation/virtualbox-${MAIN_PV}"
 
 S="${WORKDIR}"
 
-QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
 
 src_install() {
 	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
diff --git a/app-emulation/xen/xen-4.6.3-r2.ebuild b/app-emulation/xen/xen-4.6.3-r2.ebuild
index 5773ccefe898..5884d56d2ff7 100644
--- a/app-emulation/xen/xen-4.6.3-r2.ebuild
+++ b/app-emulation/xen/xen-4.6.3-r2.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=0
 	SECURITY_VER=15
 	GENTOO_VER=
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
new file mode 100644
index 000000000000..16318710dcaf
--- /dev/null
+++ b/app-forensics/honggfuzz/Manifest
@@ -0,0 +1 @@
+DIST honggfuzz-0.7.tar.gz 413122 SHA256 611472a453c870165bb44e55900e7709aa4f7bca0159a81fc599cd66d1547d2a SHA512 b0ab50ebae44fe734899a6fd4e6a861ff289ea6f449141fd974a4ad4cc8e12f0b77f7ba9163134668f5401596f2cf179c20d1e97cdc6578282f7c6b6e1c54b57 WHIRLPOOL d6e066efce44c7080467235a12392374da4bab1aa5714de1e7739cc96ecf66d44b97810b5a69b1a939c1194d9e129cc972a440943029d3a468f0946de648940a
diff --git a/app-forensics/honggfuzz/honggfuzz-0.7.ebuild b/app-forensics/honggfuzz/honggfuzz-0.7.ebuild
new file mode 100644
index 000000000000..6c9be5f22f2c
--- /dev/null
+++ b/app-forensics/honggfuzz/honggfuzz-0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A general purpose fuzzer with feedback support"
+HOMEPAGE="http://google.github.io/honggfuzz/"
+SRC_URI="https://github.com/google/honggfuzz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	sys-libs/libunwind
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	CHANGELOG
+	COPYING
+	CONTRIBUTING
+	README.md
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+
+	einstalldocs
+}
diff --git a/app-forensics/honggfuzz/metadata.xml b/app-forensics/honggfuzz/metadata.xml
new file mode 100644
index 000000000000..06de019661a3
--- /dev/null
+++ b/app-forensics/honggfuzz/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/honggfuzz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-forensics/quickfuzz/Manifest b/app-forensics/quickfuzz/Manifest
new file mode 100644
index 000000000000..ae9940cde1a7
--- /dev/null
+++ b/app-forensics/quickfuzz/Manifest
@@ -0,0 +1 @@
+DIST quickfuzz-0.1_p20160909.tar.bz2 32556776 SHA256 a0ea0b0b46e8b123afa0f3b71ceaf44b233185dd8d310e9472055aea3abe8442 SHA512 4408e1a06c178c5963a8897204615e96dfce59e98a4403e20b364d9b5200cb690209e85a1542ecd3d562f39c6117ae022877b2cea46a6be0ca1bde5a7c72800c WHIRLPOOL f923858987058b96f06c07cf3e18908dc4a156a61d1cbb91859af63b78014ad573aa3ff818c9375b3a971ba9926d070f58a5d9d2b4d8ff3d68c849818e7cbe7d
diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1-QC-2.9.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1-QC-2.9.patch
new file mode 100644
index 000000000000..1cbf88deecc7
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-0.1-QC-2.9.patch
@@ -0,0 +1,23 @@
+diff --git a/src/Misc.hs b/src/Misc.hs
+index 1aa0699..c514ae9 100644
+--- a/src/Misc.hs
++++ b/src/Misc.hs
+@@ -1,9 +1,12 @@
++{-# LANGUAGE CPP #-}
+ module Misc where
+ 
+ import Test.QuickCheck
+ import Data.Map
+ import Data.Monoid
+ 
++#if ! MIN_VERSION_QuickCheck(2,9,0)
++
+ instance Arbitrary a => Arbitrary (Last a) where
+        arbitrary = do
+            ga <- arbitrary
+@@ -43,3 +46,5 @@ instance (Arbitrary a, Arbitrary b, Arbitrary c, Arbitrary d, Arbitrary e, Arbit
+      x6 <- arbitrary
+      x7 <- arbitrary
+      return (x1,x2,x3,x4,x5,x6,x7)
++
++#endif
diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-better-erroro.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-better-erroro.patch
new file mode 100644
index 000000000000..a9ce21b4cbe8
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-better-erroro.patch
@@ -0,0 +1,9 @@
+diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs
+index ad1782c..2f39336 100644
+--- a/bundled/megadeth/Megadeth/Prim.hs
++++ b/bundled/megadeth/Megadeth/Prim.hs
+@@ -82,3 +82,3 @@ simpleConView tyName c =
+   ForallC _ _ innerCon -> simpleConView tyName innerCon
+-
++  _ -> error $ "simpleConView: failed on " ++ show c
+ 
diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8-gadt.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8-gadt.patch
new file mode 100644
index 000000000000..87d7cf24c8a3
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8-gadt.patch
@@ -0,0 +1,12 @@
+diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs
+index 2f39336..7911bc3 100644
+--- a/bundled/megadeth/Megadeth/Prim.hs
++++ b/bundled/megadeth/Megadeth/Prim.hs
+@@ -82,2 +82,7 @@ simpleConView tyName c =
+   ForallC _ _ innerCon -> simpleConView tyName innerCon
++#if MIN_VERSION_template_haskell(2,11,0)
++  -- handling: GadtC [Codec.Picture.Metadata.Gamma] [] (AppT (ConT Codec.Picture.Metadata.Keys) (ConT GHC.Types.Double))
++  GadtC [n] sts _ -> let ts = map snd sts
++                     in SimpleCon n (count ts) ts
++#endif
+   _ -> error $ "simpleConView: failed on " ++ show c
diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8.patch
new file mode 100644
index 000000000000..68219db2928d
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8.patch
@@ -0,0 +1,34 @@
+diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs
+index eb969a5..ad1782c 100644
+--- a/bundled/megadeth/Megadeth/Prim.hs
++++ b/bundled/megadeth/Megadeth/Prim.hs
+@@ -3,2 +3,3 @@
+ {-# LANGUAGE ViewPatterns    #-}
++{-# LANGUAGE CPP             #-}
+ module Megadeth.Prim where
+@@ -137,3 +138,7 @@ getDeps t ban = do
+       case tip of
++#if MIN_VERSION_template_haskell(2,11,0)
++                    TyConI (DataD _ _ _ _mkind constructors _) -> do
++#else
+                     TyConI (DataD _ _ _ constructors _) -> do
++#endif
+                           let innerTypes = nub $ concat [ findLeafTypes ty | (simpleConView t -> SimpleCon _ _ tys) <- constructors, ty <- tys, not (isVarT ty) ]
+@@ -146,3 +151,7 @@ getDeps t ban = do
+                           mapM_ getDeps' hof
++#if MIN_VERSION_template_haskell(2,11,0)
++                    TyConI (NewtypeD _ nm _  _mkind constructor _) -> do
++#else
+                     TyConI (NewtypeD _ nm _ constructor _) -> do
++#endif
+                           let (SimpleCon _ 0 ts )= simpleConView nm constructor
+@@ -187,4 +196,9 @@ isinsName className n = do
+         case inf of
++#if MIN_VERSION_template_haskell(2,11,0)
++            TyConI (DataD _ _ preq _mkind _ _) -> doPreq className n preq
++            TyConI (NewtypeD _ _ preq _mkind _ _) -> doPreq className n preq
++#else
+             TyConI (DataD _ _ preq _ _) -> doPreq className n preq
+             TyConI (NewtypeD _ _ preq _ _) -> doPreq className n preq
++#endif
+             TyConI (TySynD _ preq _ ) -> doPreq className n preq
diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-1.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-1.patch
new file mode 100644
index 000000000000..436df0e85e35
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-1.patch
@@ -0,0 +1,22 @@
+diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs
+index d42b896..fc94945 100644
+--- a/src/DeriveArbitrary.hs
++++ b/src/DeriveArbitrary.hs
+@@ -26,7 +26,7 @@ import Data.List.Split
+ import Data.Maybe
+ -- Gen
+ import Language.Haskell.TH
+-import Language.Haskell.TH.Syntax
++import Language.Haskell.TH.Syntax as TH
+ import Test.QuickCheck
+ import GHC.Exts
+ import GHC.Types
+@@ -38,7 +38,7 @@ import Control.Applicative
+ import Data.List
+ 
+ -- | Build the arbitrary function with makeArbs
+-chooseExpQ :: Name -> Name -> Name -> Integer -> Type -> ExpQ
++chooseExpQ :: Name -> Name -> Name -> Integer -> TH.Type -> ExpQ
+ chooseExpQ g n t bf (AppT ListT ty) = [| listOf $ resize ($(varE  n) `div` 10) arbitrary |]
+ chooseExpQ g n t bf ty | headOf ty /= t = [| resize (max 0 ($(varE n) - 1)) arbitrary |]
+ chooseExpQ g n t bf ty =
diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-2.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-2.patch
new file mode 100644
index 000000000000..5ac7f4de719d
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-2.patch
@@ -0,0 +1,87 @@
+diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs
+index fc94945..6f2d77f 100644
+--- a/src/DeriveArbitrary.hs
++++ b/src/DeriveArbitrary.hs
+@@ -3,2 +3,3 @@
+ {-# LANGUAGE LambdaCase #-}
++{-# LANGUAGE CPP #-}
+ module DeriveArbitrary (
+@@ -39,2 +40,8 @@ import Data.List
+ 
++#if MIN_VERSION_template_haskell(2,11,0)
++#    define TH211MBKIND _maybe_kind
++#else
++#    define TH211MBKIND
++#endif
++
+ -- | Build the arbitrary function with makeArbs
+@@ -80,3 +87,3 @@ deriveArbitrary t = do
+     case inf of
+-        TyConI (DataD _ _ params constructors _) -> do
++        TyConI (DataD _ _ params TH211MBKIND constructors _) -> do
+               let ns  = map varT $ paramNames params
+@@ -111,3 +118,3 @@ deriveArbitrary t = do
+                                  where go n = $(gos 'go 'n)|]
+-        TyConI (NewtypeD _ _ params con _) -> do 
++        TyConI (NewtypeD _ _ params TH211MBKIND con _) -> do 
+             let ns = map varT $ paramNames params
+@@ -281,3 +288,3 @@ customG name = do
+                 
+-        TyConI (DataD _ _ params constructors _) ->
++        TyConI (DataD _ _ params TH211MBKIND constructors _) ->
+             let fnm = mkName "prob_gen" -- "customGen_" ++ (map (\x -> if x == '.' then '_' else
+diff --git a/src/DeriveFixable.hs b/src/DeriveFixable.hs
+index ec8b8be..83593e6 100644
+--- a/src/DeriveFixable.hs
++++ b/src/DeriveFixable.hs
+@@ -1,2 +1,3 @@
+ {-# Language TemplateHaskell, ConstraintKinds, FlexibleInstances, FlexibleContexts, IncoherentInstances, MultiParamTypeClasses #-}
++{-# Language CPP #-}
+ 
+@@ -15,2 +16,8 @@ import Control.Monad.Trans.State
+ 
++#if MIN_VERSION_template_haskell(2,11,0)
++#    define TH211MBKIND _maybe_kind
++#else
++#    define TH211MBKIND
++#endif
++
+ --The state is composed of identifiers
+@@ -147,3 +154,3 @@ mkFix i v a t = do ti <- reify t
+                    case ti of
+-                      TyConI (DataD _ _ params tcons _) -> do
++                      TyConI (DataD _ _ params TH211MBKIND tcons _) -> do
+                         let cstuff = map getStuff tcons
+@@ -155,3 +162,3 @@ mkFix i v a t = do ti <- reify t
+                         case ii of
+-                          TyConI (DataD _ _ ip _ _) -> do
++                          TyConI (DataD _ _ ip TH211MBKIND _ _) -> do
+                             let ivars = map (varT . getParName) ip
+@@ -180,3 +187,3 @@ mkFix i v a t = do ti <- reify t
+                                                             gg = $(mkFixBody matches) |]
+-                          TyConI (NewtypeD _ _ ip _ _) -> do
++                          TyConI (NewtypeD _ _ ip TH211MBKIND _ _) -> do
+                             let ivars = map (varT . getParName) ip
+diff --git a/src/DeriveMutation.hs b/src/DeriveMutation.hs
+index ae58345..7494c50 100644
+--- a/src/DeriveMutation.hs
++++ b/src/DeriveMutation.hs
+@@ -3,2 +3,3 @@
+ {-# LANGUAGE FlexibleInstances,UndecidableInstances#-}
++{-# LANGUAGE CPP #-}
+ module DeriveMutation where
+@@ -17,2 +18,9 @@ import Data.List
+ import Megadeth.Prim
++
++#if MIN_VERSION_template_haskell(2,11,0)
++#    define TH211MBKIND _maybe_kind
++#else
++#    define TH211MBKIND
++#endif
++
+ --import Mutation
+@@ -100,3 +108,3 @@ devMutation name customGen = do
+         TyConI (TySynD _ _ ty) -> return [] -- devMutation (headOf ty) Nothing
+-        TyConI (DataD _ _ params constructors _) -> do
++        TyConI (DataD _ _ params TH211MBKIND constructors _) -> do
+             let fnm = mkName $ "mutt" -- ++ (showName name) 
diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-ttasm-layout.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-ttasm-layout.patch
new file mode 100644
index 000000000000..b66ea1a5c95b
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-ttasm-layout.patch
@@ -0,0 +1,11 @@
+diff --git a/bundled/ttasm/TTFInstructions.hs b/bundled/ttasm/TTFInstructions.hs
+index 6eb9378..8db99cd 100644
+--- a/bundled/ttasm/TTFInstructions.hs
++++ b/bundled/ttasm/TTFInstructions.hs
+@@ -128,4 +128,4 @@ tableChecksum table =
+     let tc = do
+-        e <- remaining
+-        if e < 4
++         e <- remaining
++         if e < 4
+             then return 0
diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-better-erroro.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-better-erroro.patch
new file mode 100644
index 000000000000..a9ce21b4cbe8
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-better-erroro.patch
@@ -0,0 +1,9 @@
+diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs
+index ad1782c..2f39336 100644
+--- a/bundled/megadeth/Megadeth/Prim.hs
++++ b/bundled/megadeth/Megadeth/Prim.hs
+@@ -82,3 +82,3 @@ simpleConView tyName c =
+   ForallC _ _ innerCon -> simpleConView tyName innerCon
+-
++  _ -> error $ "simpleConView: failed on " ++ show c
+ 
diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8-gadt.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8-gadt.patch
new file mode 100644
index 000000000000..87d7cf24c8a3
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8-gadt.patch
@@ -0,0 +1,12 @@
+diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs
+index 2f39336..7911bc3 100644
+--- a/bundled/megadeth/Megadeth/Prim.hs
++++ b/bundled/megadeth/Megadeth/Prim.hs
+@@ -82,2 +82,7 @@ simpleConView tyName c =
+   ForallC _ _ innerCon -> simpleConView tyName innerCon
++#if MIN_VERSION_template_haskell(2,11,0)
++  -- handling: GadtC [Codec.Picture.Metadata.Gamma] [] (AppT (ConT Codec.Picture.Metadata.Keys) (ConT GHC.Types.Double))
++  GadtC [n] sts _ -> let ts = map snd sts
++                     in SimpleCon n (count ts) ts
++#endif
+   _ -> error $ "simpleConView: failed on " ++ show c
diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8.patch
new file mode 100644
index 000000000000..68219db2928d
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8.patch
@@ -0,0 +1,34 @@
+diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs
+index eb969a5..ad1782c 100644
+--- a/bundled/megadeth/Megadeth/Prim.hs
++++ b/bundled/megadeth/Megadeth/Prim.hs
+@@ -3,2 +3,3 @@
+ {-# LANGUAGE ViewPatterns    #-}
++{-# LANGUAGE CPP             #-}
+ module Megadeth.Prim where
+@@ -137,3 +138,7 @@ getDeps t ban = do
+       case tip of
++#if MIN_VERSION_template_haskell(2,11,0)
++                    TyConI (DataD _ _ _ _mkind constructors _) -> do
++#else
+                     TyConI (DataD _ _ _ constructors _) -> do
++#endif
+                           let innerTypes = nub $ concat [ findLeafTypes ty | (simpleConView t -> SimpleCon _ _ tys) <- constructors, ty <- tys, not (isVarT ty) ]
+@@ -146,3 +151,7 @@ getDeps t ban = do
+                           mapM_ getDeps' hof
++#if MIN_VERSION_template_haskell(2,11,0)
++                    TyConI (NewtypeD _ nm _  _mkind constructor _) -> do
++#else
+                     TyConI (NewtypeD _ nm _ constructor _) -> do
++#endif
+                           let (SimpleCon _ 0 ts )= simpleConView nm constructor
+@@ -187,4 +196,9 @@ isinsName className n = do
+         case inf of
++#if MIN_VERSION_template_haskell(2,11,0)
++            TyConI (DataD _ _ preq _mkind _ _) -> doPreq className n preq
++            TyConI (NewtypeD _ _ preq _mkind _ _) -> doPreq className n preq
++#else
+             TyConI (DataD _ _ preq _ _) -> doPreq className n preq
+             TyConI (NewtypeD _ _ preq _ _) -> doPreq className n preq
++#endif
+             TyConI (TySynD _ preq _ ) -> doPreq className n preq
diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-1.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-1.patch
new file mode 100644
index 000000000000..436df0e85e35
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-1.patch
@@ -0,0 +1,22 @@
+diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs
+index d42b896..fc94945 100644
+--- a/src/DeriveArbitrary.hs
++++ b/src/DeriveArbitrary.hs
+@@ -26,7 +26,7 @@ import Data.List.Split
+ import Data.Maybe
+ -- Gen
+ import Language.Haskell.TH
+-import Language.Haskell.TH.Syntax
++import Language.Haskell.TH.Syntax as TH
+ import Test.QuickCheck
+ import GHC.Exts
+ import GHC.Types
+@@ -38,7 +38,7 @@ import Control.Applicative
+ import Data.List
+ 
+ -- | Build the arbitrary function with makeArbs
+-chooseExpQ :: Name -> Name -> Name -> Integer -> Type -> ExpQ
++chooseExpQ :: Name -> Name -> Name -> Integer -> TH.Type -> ExpQ
+ chooseExpQ g n t bf (AppT ListT ty) = [| listOf $ resize ($(varE  n) `div` 10) arbitrary |]
+ chooseExpQ g n t bf ty | headOf ty /= t = [| resize (max 0 ($(varE n) - 1)) arbitrary |]
+ chooseExpQ g n t bf ty =
diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-2.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-2.patch
new file mode 100644
index 000000000000..5ac7f4de719d
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-2.patch
@@ -0,0 +1,87 @@
+diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs
+index fc94945..6f2d77f 100644
+--- a/src/DeriveArbitrary.hs
++++ b/src/DeriveArbitrary.hs
+@@ -3,2 +3,3 @@
+ {-# LANGUAGE LambdaCase #-}
++{-# LANGUAGE CPP #-}
+ module DeriveArbitrary (
+@@ -39,2 +40,8 @@ import Data.List
+ 
++#if MIN_VERSION_template_haskell(2,11,0)
++#    define TH211MBKIND _maybe_kind
++#else
++#    define TH211MBKIND
++#endif
++
+ -- | Build the arbitrary function with makeArbs
+@@ -80,3 +87,3 @@ deriveArbitrary t = do
+     case inf of
+-        TyConI (DataD _ _ params constructors _) -> do
++        TyConI (DataD _ _ params TH211MBKIND constructors _) -> do
+               let ns  = map varT $ paramNames params
+@@ -111,3 +118,3 @@ deriveArbitrary t = do
+                                  where go n = $(gos 'go 'n)|]
+-        TyConI (NewtypeD _ _ params con _) -> do 
++        TyConI (NewtypeD _ _ params TH211MBKIND con _) -> do 
+             let ns = map varT $ paramNames params
+@@ -281,3 +288,3 @@ customG name = do
+                 
+-        TyConI (DataD _ _ params constructors _) ->
++        TyConI (DataD _ _ params TH211MBKIND constructors _) ->
+             let fnm = mkName "prob_gen" -- "customGen_" ++ (map (\x -> if x == '.' then '_' else
+diff --git a/src/DeriveFixable.hs b/src/DeriveFixable.hs
+index ec8b8be..83593e6 100644
+--- a/src/DeriveFixable.hs
++++ b/src/DeriveFixable.hs
+@@ -1,2 +1,3 @@
+ {-# Language TemplateHaskell, ConstraintKinds, FlexibleInstances, FlexibleContexts, IncoherentInstances, MultiParamTypeClasses #-}
++{-# Language CPP #-}
+ 
+@@ -15,2 +16,8 @@ import Control.Monad.Trans.State
+ 
++#if MIN_VERSION_template_haskell(2,11,0)
++#    define TH211MBKIND _maybe_kind
++#else
++#    define TH211MBKIND
++#endif
++
+ --The state is composed of identifiers
+@@ -147,3 +154,3 @@ mkFix i v a t = do ti <- reify t
+                    case ti of
+-                      TyConI (DataD _ _ params tcons _) -> do
++                      TyConI (DataD _ _ params TH211MBKIND tcons _) -> do
+                         let cstuff = map getStuff tcons
+@@ -155,3 +162,3 @@ mkFix i v a t = do ti <- reify t
+                         case ii of
+-                          TyConI (DataD _ _ ip _ _) -> do
++                          TyConI (DataD _ _ ip TH211MBKIND _ _) -> do
+                             let ivars = map (varT . getParName) ip
+@@ -180,3 +187,3 @@ mkFix i v a t = do ti <- reify t
+                                                             gg = $(mkFixBody matches) |]
+-                          TyConI (NewtypeD _ _ ip _ _) -> do
++                          TyConI (NewtypeD _ _ ip TH211MBKIND _ _) -> do
+                             let ivars = map (varT . getParName) ip
+diff --git a/src/DeriveMutation.hs b/src/DeriveMutation.hs
+index ae58345..7494c50 100644
+--- a/src/DeriveMutation.hs
++++ b/src/DeriveMutation.hs
+@@ -3,2 +3,3 @@
+ {-# LANGUAGE FlexibleInstances,UndecidableInstances#-}
++{-# LANGUAGE CPP #-}
+ module DeriveMutation where
+@@ -17,2 +18,9 @@ import Data.List
+ import Megadeth.Prim
++
++#if MIN_VERSION_template_haskell(2,11,0)
++#    define TH211MBKIND _maybe_kind
++#else
++#    define TH211MBKIND
++#endif
++
+ --import Mutation
+@@ -100,3 +108,3 @@ devMutation name customGen = do
+         TyConI (TySynD _ _ ty) -> return [] -- devMutation (headOf ty) Nothing
+-        TyConI (DataD _ _ params constructors _) -> do
++        TyConI (DataD _ _ params TH211MBKIND constructors _) -> do
+             let fnm = mkName $ "mutt" -- ++ (showName name) 
diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-ttasm-layout.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-ttasm-layout.patch
new file mode 100644
index 000000000000..b66ea1a5c95b
--- /dev/null
+++ b/app-forensics/quickfuzz/files/quickfuzz-9999-ttasm-layout.patch
@@ -0,0 +1,11 @@
+diff --git a/bundled/ttasm/TTFInstructions.hs b/bundled/ttasm/TTFInstructions.hs
+index 6eb9378..8db99cd 100644
+--- a/bundled/ttasm/TTFInstructions.hs
++++ b/bundled/ttasm/TTFInstructions.hs
+@@ -128,4 +128,4 @@ tableChecksum table =
+     let tc = do
+-        e <- remaining
+-        if e < 4
++         e <- remaining
++         if e < 4
+             then return 0
diff --git a/app-forensics/quickfuzz/metadata.xml b/app-forensics/quickfuzz/metadata.xml
new file mode 100644
index 000000000000..1e1e29136406
--- /dev/null
+++ b/app-forensics/quickfuzz/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name='archs'>support archive formats</flag>
+		<flag name='codes'>support cource code formats</flag>
+		<flag name='docs'>support document formats</flag>
+		<flag name='imgs'>support image formats</flag>
+		<flag name='media'>support media formats</flag>
+		<flag name='net'>support networking formats</flag>
+		<flag name='pki'>support PKI formats</flag>
+	</use>
+	<longdescription>
+		An experimental grammar fuzzer in Haskell using QuickCheck.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">CIFASIS/QuickFuzz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-forensics/quickfuzz/quickfuzz-0.1_p20160909.ebuild b/app-forensics/quickfuzz/quickfuzz-0.1_p20160909.ebuild
new file mode 100644
index 000000000000..748df18bb436
--- /dev/null
+++ b/app-forensics/quickfuzz/quickfuzz-0.1_p20160909.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+MY_PN="QuickFuzz"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An experimental grammar fuzzer in Haskell using QuickCheck"
+HOMEPAGE="http://quickfuzz.org/"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="archs codes docs imgs media net pki"
+
+RDEPEND="dev-haskell/abstract-par:=
+	dev-haskell/argparser:=
+	dev-haskell/derive:=
+	dev-haskell/linear:=
+	dev-haskell/monad-par:=
+	dev-haskell/mtl:=
+	dev-haskell/parallel-io:=
+	dev-haskell/primitive:=
+	dev-haskell/quickcheck:2=
+	dev-haskell/quickcheck-unicode:=
+	dev-haskell/random:=
+	dev-haskell/split:=
+	dev-haskell/text:=
+	dev-haskell/vector:=
+	dev-haskell/wl-pprint:=
+	>=dev-lang/ghc-7.8.2:=
+	archs? ( dev-haskell/base16-bytestring:=
+			>=dev-haskell/tar-0.5:=
+			dev-haskell/zip-archive:= )
+	!archs? ( net? ( dev-haskell/base16-bytestring:= ) )
+	codes? ( dev-haskell/haxml:=
+			dev-haskell/json:=
+			dev-haskell/language-bash:=
+			dev-haskell/language-css:=
+			dev-haskell/language-dot:=
+			dev-haskell/language-ecmascript:=
+			dev-haskell/language-glsl:=
+			dev-haskell/language-lua:=
+			dev-haskell/language-python:=
+			dev-haskell/shell-escape:=
+			dev-haskell/uniplate:= )
+	docs? ( app-text/pandoc:=
+		dev-haskell/data-default:=
+		dev-haskell/hcg-minus:=
+		dev-haskell/hps:=
+		dev-haskell/icalendar:=
+		dev-haskell/pandoc-types:= )
+	imgs? ( dev-haskell/ac-ppm:=
+		dev-haskell/memory:=
+		dev-haskell/attoparsec:=
+		dev-haskell/lens:=
+		dev-haskell/scientific:=
+		dev-haskell/thyme:=
+		dev-haskell/xml:=
+		>=dev-haskell/zlib-0.6:= )
+	!imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) )
+	media? ( dev-haskell/hcodecs:=
+			dev-haskell/hunit:=
+			dev-haskell/mtl:=
+			dev-haskell/old-locale:=
+			dev-haskell/random:=
+			dev-haskell/idiii:=
+			dev-haskell/bitwise:=
+			dev-haskell/monad-loops:=
+			dev-haskell/mtl:=
+			dev-haskell/wavy:= )
+	net? ( dev-haskell/concurrent-extra:=
+		dev-haskell/dns:=
+		dev-haskell/http:=
+		dev-haskell/iproute:=
+		dev-haskell/network:=
+		dev-haskell/network-uri:=
+		dev-haskell/unbounded-delays:= )
+	pki? ( dev-haskell/hourglass:=
+		dev-haskell/asn1-types:=
+		dev-haskell/asn1-parse:=
+		dev-haskell/cryptonite:=
+		dev-haskell/hourglass:=
+		dev-haskell/memory:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+PATCHES=(
+	# bundled libs:
+	"${FILESDIR}"/${PN}-0.1_p20160909-megadeth-ghc-8.patch
+	"${FILESDIR}"/${PN}-0.1_p20160909-megadeth-better-erroro.patch
+	"${FILESDIR}"/${PN}-0.1_p20160909-megadeth-ghc-8-gadt.patch
+
+	"${FILESDIR}"/${PN}-0.1_p20160909-ttasm-layout.patch
+
+	# package itself:
+	"${FILESDIR}"/${PN}-0.1-QC-2.9.patch
+	"${FILESDIR}"/${PN}-0.1_p20160909-th-2.11-1.patch
+	"${FILESDIR}"/${PN}-0.1_p20160909-th-2.11-2.patch
+)
+
+# As of 2016-09-10 QuickFuzz forks a few hackage packages
+# without renames:
+# - asn1-encoding: stabilised handling of corrupterd data
+# - hogg: more functions are exported directly
+# - juicypixels: more functions and modules are exported,
+#                unsafe functions are changed to safe
+# - svg-tree: expose internal modules
+# - x509: stabilised handling of corrupterd data
+# - megadeth: not a fork but has no releases
+# - ttasm: cabalised, renamed module
+
+src_prepare() {
+	default
+
+	# inline dependencies of bundled dependencies
+	cabal_chdeps \
+		'JuicyPixels'   'memory' \
+		'asn1-encoding' 'hourglass' \
+		'hogg'          'array' \
+		'megadeth'      'base' \
+		'svg-tree'      'attoparsec, lens, scientific, thyme' \
+		'ttasm'         'bitwise, mtl, monad-loops' \
+		'x509'          'asn1-parse, cryptonite, hourglass, memory' \
+		\
+		'hs-source-dirs:      src' 'hs-source-dirs: src, bundled/Juicy.Pixels/src, bundled/hogg, bundled/hs-asn1-encoding, bundled/hs-certificate-x509, bundled/megadeth, bundled/svg-tree/src, bundled/ttasm'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag archs archs) \
+		$(cabal_flag codes codes) \
+		$(cabal_flag docs docs) \
+		$(cabal_flag imgs imgs) \
+		$(cabal_flag media media) \
+		$(cabal_flag net net) \
+		$(cabal_flag pki pki)
+}
diff --git a/app-forensics/quickfuzz/quickfuzz-9999.ebuild b/app-forensics/quickfuzz/quickfuzz-9999.ebuild
new file mode 100644
index 000000000000..8e47d5c453a0
--- /dev/null
+++ b/app-forensics/quickfuzz/quickfuzz-9999.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin"
+inherit git-r3 haskell-cabal
+
+MY_PN="QuickFuzz"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An experimental grammar fuzzer in Haskell using QuickCheck"
+HOMEPAGE="http://quickfuzz.org/"
+EGIT_REPO_URI="https://github.com/CIFASIS/QuickFuzz.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="archs codes docs imgs media net pki"
+
+RDEPEND="dev-haskell/abstract-par:=
+	dev-haskell/argparser:=
+	dev-haskell/derive:=
+	dev-haskell/linear:=
+	dev-haskell/monad-par:=
+	dev-haskell/mtl:=
+	dev-haskell/parallel-io:=
+	dev-haskell/primitive:=
+	dev-haskell/quickcheck:2=
+	dev-haskell/quickcheck-unicode:=
+	dev-haskell/random:=
+	dev-haskell/split:=
+	dev-haskell/text:=
+	dev-haskell/vector:=
+	dev-haskell/wl-pprint:=
+	>=dev-lang/ghc-7.8.2:=
+	archs? ( dev-haskell/base16-bytestring:=
+			>=dev-haskell/tar-0.5:=
+			dev-haskell/zip-archive:= )
+	!archs? ( net? ( dev-haskell/base16-bytestring:= ) )
+	codes? ( dev-haskell/haxml:=
+			dev-haskell/json:=
+			dev-haskell/language-bash:=
+			dev-haskell/language-css:=
+			dev-haskell/language-dot:=
+			dev-haskell/language-ecmascript:=
+			dev-haskell/language-glsl:=
+			dev-haskell/language-lua:=
+			dev-haskell/language-python:=
+			dev-haskell/shell-escape:=
+			dev-haskell/uniplate:= )
+	docs? ( app-text/pandoc:=
+		dev-haskell/data-default:=
+		dev-haskell/hcg-minus:=
+		dev-haskell/hps:=
+		dev-haskell/icalendar:=
+		dev-haskell/pandoc-types:= )
+	imgs? ( dev-haskell/ac-ppm:=
+		dev-haskell/memory:=
+		dev-haskell/attoparsec:=
+		dev-haskell/lens:=
+		dev-haskell/scientific:=
+		dev-haskell/thyme:=
+		dev-haskell/xml:=
+		>=dev-haskell/zlib-0.6:= )
+	!imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) )
+	media? ( dev-haskell/hcodecs:=
+			dev-haskell/hunit:=
+			dev-haskell/mtl:=
+			dev-haskell/old-locale:=
+			dev-haskell/random:=
+			dev-haskell/idiii:=
+			dev-haskell/bitwise:=
+			dev-haskell/monad-loops:=
+			dev-haskell/mtl:=
+			dev-haskell/wavy:= )
+	net? ( dev-haskell/concurrent-extra:=
+		dev-haskell/dns:=
+		dev-haskell/http:=
+		dev-haskell/iproute:=
+		dev-haskell/network:=
+		dev-haskell/network-uri:=
+		dev-haskell/unbounded-delays:= )
+	pki? ( dev-haskell/hourglass:=
+		dev-haskell/asn1-types:=
+		dev-haskell/asn1-parse:=
+		dev-haskell/cryptonite:=
+		dev-haskell/hourglass:=
+		dev-haskell/memory:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+PATCHES=(
+	# bundled libs:
+	"${FILESDIR}"/${P}-megadeth-ghc-8.patch
+	"${FILESDIR}"/${P}-megadeth-better-erroro.patch
+	"${FILESDIR}"/${P}-megadeth-ghc-8-gadt.patch
+
+	"${FILESDIR}"/${P}-ttasm-layout.patch
+
+	# package itself:
+	"${FILESDIR}"/${PN}-0.1-QC-2.9.patch
+	"${FILESDIR}"/${P}-th-2.11-1.patch
+	"${FILESDIR}"/${P}-th-2.11-2.patch
+)
+
+# As of 2016-09-10 QuickFuzz forks a few hackage packages
+# without renames:
+# - asn1-encoding: stabilised handling of corrupterd data
+# - hogg: more functions are exported directly
+# - juicypixels: more functions and modules are exported,
+#                unsafe functions are changed to safe
+# - svg-tree: expose internal modules
+# - x509: stabilised handling of corrupterd data
+# - megadeth: not a fork but has no releases
+# - ttasm: cabalised, renamed module
+
+src_unpack() {
+	git-r3_src_unpack
+
+	cd "${S}"
+
+	local forked_repos=(
+		Juicy.Pixels
+		hogg
+		hs-asn1-encoding
+		hs-certificate-x509
+		svg-tree
+		ttasm
+
+		# not exactly fork. just unreleased upstream library
+		megadeth
+	)
+	local repo_name
+	local repo_subdir=${S}/bundled
+
+	mkdir "${repo_subdir}/" || die
+	for repo_name in "${forked_repos[@]}"; do
+		git-r3_fetch    https://github.com/CIFASIS/${repo_name}.git
+		git-r3_checkout https://github.com/CIFASIS/${repo_name}.git "${repo_subdir}/${repo_name}"
+	done
+}
+
+src_prepare() {
+	default
+
+	# inline dependencies of bundled dependencies
+	cabal_chdeps \
+		'JuicyPixels'   'memory' \
+		'asn1-encoding' 'hourglass' \
+		'hogg'          'array' \
+		'megadeth'      'base' \
+		'svg-tree'      'attoparsec, lens, scientific, thyme' \
+		'ttasm'         'bitwise, mtl, monad-loops' \
+		'x509'          'asn1-parse, cryptonite, hourglass, memory' \
+		\
+		'hs-source-dirs:      src' 'hs-source-dirs: src, bundled/Juicy.Pixels/src, bundled/hogg, bundled/hs-asn1-encoding, bundled/hs-certificate-x509, bundled/megadeth, bundled/svg-tree/src, bundled/ttasm'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag archs archs) \
+		$(cabal_flag codes codes) \
+		$(cabal_flag docs docs) \
+		$(cabal_flag imgs imgs) \
+		$(cabal_flag media media) \
+		$(cabal_flag net net) \
+		$(cabal_flag pki pki)
+}
diff --git a/app-forensics/radamsa/Manifest b/app-forensics/radamsa/Manifest
new file mode 100644
index 000000000000..b26d1f34a1a4
--- /dev/null
+++ b/app-forensics/radamsa/Manifest
@@ -0,0 +1 @@
+DIST radamsa-0.5.tar.gz 168177 SHA256 e21a86aa6dca7e4619085fc60fb664d0a1bd067ca6ebfbcb16ab2d57c8854cb4 SHA512 d48f61ea7c0703d7fdf68ab32894e93d774e8f2893642a81046b8210d7d433f4be8930d7d79317ddb0882cf54b06505c541827b925f30b861ae8205e300fed80 WHIRLPOOL 322c497e8f07ac77e2ffaade0badf980ba7673af5508eb0ab3b12de15afc71ae69e89281531283c95392ea9557b10eb130623e8e44b463752ef8d5d36ecf7ce9
diff --git a/app-forensics/radamsa/metadata.xml b/app-forensics/radamsa/metadata.xml
new file mode 100644
index 000000000000..093dde4f8e7d
--- /dev/null
+++ b/app-forensics/radamsa/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aoh/radamsa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-forensics/radamsa/radamsa-0.5-r1.ebuild b/app-forensics/radamsa/radamsa-0.5-r1.ebuild
new file mode 100644
index 000000000000..145a691bf4c2
--- /dev/null
+++ b/app-forensics/radamsa/radamsa-0.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A general purpose fuzzer"
+HOMEPAGE="https://github.com/aoh/radamsa"
+SRC_URI="https://github.com/aoh/radamsa/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs an owl-lisp
+
+DOCS=( LICENCE NEWS README.md )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+
+	einstalldocs
+}
diff --git a/app-forensics/zzuf/Manifest b/app-forensics/zzuf/Manifest
index ef1559b47500..34f44a26078f 100644
--- a/app-forensics/zzuf/Manifest
+++ b/app-forensics/zzuf/Manifest
@@ -1,2 +1,3 @@
 DIST zzuf-0.13-zzcat-zzat-rename.patch.bz2 11370 SHA256 33864b8a54fc71464650130c5b2092d969776535f787075119a6750e869d99d3 SHA512 5df3ccc08315c8a983f13294ca3fc38f3b7094a9ba04a46ee7740522ad486318bcf019fec78d60581cb541b5ebdbe1d0751273233d5a54b03f411aef84790529 WHIRLPOOL 87c8561d2eba2626d97600964b7ee8851a1f8a4dc40eda758b5e4854b9149f71b8a26223f36355b707c1e30d559dd1e977292ba2f17d79fa1992a414a573c31d
 DIST zzuf-0.13.tar.gz 461498 SHA256 0842c548522028c3e0d9c9cf7d09f6320b661f33824bb6df19ca209851bdf627 SHA512 e8208dae68b4eee5ebc96775476f616c6822bc9a6a9c753d7f477e9f3e6f527a03e1aec494c2cb8a6666f3159104ea2e221acf8da35efb7d8e357666dbc315ce WHIRLPOOL b4fe880dbd894ee270a847614456536e7d3f615bf3fa01251cbeac863f95704ff766e858fcb037d7e1dcd089acfffb297aea6c8fa01bde4940370288590e8867
+DIST zzuf-0.15.tar.bz2 394859 SHA256 04353d94c68391b3945199f100ab47fc5ff7815db1e92581a600d4175e3a6872 SHA512 7e5b55761c0f75af10920e1ffdde1564022b8d43ce8f59d6b0a27d2c59779ef98dd561cb26f781b8cee09016f08144439770ea2db250874d4bebd2443f592898 WHIRLPOOL 092623a98ced33891e345509eb1fb3880237aac388b7fcb3d0afa32e5439ed43eb5b290d3940ae616f5ee46273ae03368d79653819c65b0c62499edc94808ccd
diff --git a/app-forensics/zzuf/metadata.xml b/app-forensics/zzuf/metadata.xml
index 6f49eba8f496..e8a678de174d 100644
--- a/app-forensics/zzuf/metadata.xml
+++ b/app-forensics/zzuf/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">samhocevar/zzuf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-forensics/zzuf/zzuf-0.13-r1.ebuild b/app-forensics/zzuf/zzuf-0.13-r1.ebuild
index 028e38fc494a..b367d8a16a09 100644
--- a/app-forensics/zzuf/zzuf-0.13-r1.ebuild
+++ b/app-forensics/zzuf/zzuf-0.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="Transparent application input fuzzer"
-HOMEPAGE="http://libcaca.zoy.org/wiki/zzuf/"
+HOMEPAGE="http://caca.zoy.org/wiki/zzuf"
 SRC_URI="http://caca.zoy.org/files/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~cardoe/distfiles/${P}-zzcat-zzat-rename.patch.bz2"
 
diff --git a/app-forensics/zzuf/zzuf-0.15.ebuild b/app-forensics/zzuf/zzuf-0.15.ebuild
new file mode 100644
index 000000000000..02a51a24c326
--- /dev/null
+++ b/app-forensics/zzuf/zzuf-0.15.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Transparent application input fuzzer"
+HOMEPAGE="http://caca.zoy.org/wiki/zzuf"
+SRC_URI="https://github.com/samhocevar/zzuf/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+# Uses dlopen hack to hijack many libc functions.
+# Fails 2 tests with sandbox enabled: check-zzuf-A-autoinc check-utils
+RESTRICT="test"
+
+DOCS=( AUTHORS COPYING TODO )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete
+}
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index a451ecaa6eea..817d87477f2f 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,2 +1,3 @@
 DIST geoclue-0.12.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
 DIST geoclue-2.4.3.tar.xz 389260 SHA256 ada9dba870dd79e1b21923aeda4d82b66cbda39e57978fbe3d83d356cc3c605e SHA512 6e6fba4e04458d486e098898f13d3a5319d3bb185a9ac2801cac710639bae46b6512c82c61b2a666fa920abf664446d937e00018ff078a55ce05b8ebc026a01d WHIRLPOOL 5658c1b0e89d9f7dbceaf149db06973d809e1ecdf88fbca2f484568353c1fd2539150f4b04081189dc14f941bd179135fa3d5bfd795e0714ee92d412968da656
+DIST geoclue-2.4.4.tar.xz 392340 SHA256 9c43fb9d0c12067ea64400500abb0640194947d4c2c55e38545afe5d9c5c315c SHA512 46995aa261ff5c391eb1e933088e24e40e595a98563b541675cbfab38e69f410cd3ad7a3c1f4126e4eb62eea0be9a77f8e3c37af89b4aaad81e07c150b003f7a WHIRLPOOL 42691170b0e9097fb4caef656cd79c0861f61cd0bbf811a74653799848184f98f960e5294375b5632c30de29e798318443706ff803ae46d19ca422abe3caaac4
diff --git a/app-misc/geoclue/geoclue-2.4.4.ebuild b/app-misc/geoclue/geoclue-2.4.4.ebuild
new file mode 100644
index 000000000000..d7b5aeaee6f6
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+introspection +modemmanager zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/json-glib-0.14
+	>=net-libs/libsoup-2.42:2.4
+	sys-apps/dbus
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	modemmanager? ( >=net-misc/modemmanager-1 )
+	zeroconf? ( >=net-dns/avahi-0.6.10 )
+	!<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
+}
+
+src_configure() {
+	# debug only affects CFLAGS
+	gnome2_src_configure \
+		--enable-backend \
+		--with-dbus-service-user=geoclue \
+		$(use_enable introspection) \
+		$(use_enable modemmanager 3g-source) \
+		$(use_enable modemmanager cdma-source) \
+		$(use_enable modemmanager modem-gps-source) \
+		$(use_enable zeroconf nmea-source) \
+		$(systemd_with_unitdir)
+}
+
+pkg_preinst() {
+	enewgroup geoclue
+	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+	gnome2_pkg_preinst
+}
diff --git a/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch b/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch
deleted file mode 100644
index 9645e263deda..000000000000
--- a/app-misc/mtail/files/mtail-1.1.1-remove-blanks.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- mtail.orig	2003-11-07 19:02:34.000000000 +0000
-+++ mtail	2003-11-07 19:19:18.000000000 +0000
-@@ -46,6 +46,7 @@
- verbose = 0
- silent = 0
- active = 0
-+remove_blanks = 0
- 
- # sets up the interrupt handler, calls processargs(), sets up and starts the
- # tailers.
-@@ -119,6 +120,8 @@
-             if line[len(line)-1] == '\n':
-                 line = line[:len(line)-1]
-             line = filter(line)
-+            if remove_blanks and not line:
-+                continue
-             lock.acquire()
-             try:
-                 if (multiple or verbose) and (not silent) \
-@@ -138,12 +141,14 @@
-     global verbose
-     global silent
-     global config_file
-+    global remove_blanks
-     filenames = []
-     lines = None
-     follow = 0
-     try:
-         opts, pargs = getopt.getopt(sys.argv[1:], 'fn:?hvq', ["follow",
--            "lines=", "help", "verbose", "quiet", "silent", "config="])
-+            "lines=", "help", "verbose", "quiet", "silent", "config=",
-+            "remove-blanks"])
-     except getopt.error:
-         print 'unrecognized option!'
-         print
-@@ -163,6 +168,8 @@
-             silent = 1
-         elif opt[0] in ['--config']:
-             config_file = opt[1]
-+        elif opt[0] in ['--remove-blanks']:
-+            remove_blanks = 1
-     if lines == None:
-         lines = 10
-     for filename in pargs:
-@@ -186,6 +193,7 @@
-     print '      -v, --verbose          always output headers giving file names'
-     print '      -q, --quiet, --silent  never output headers giving file names'
-     print '      --config=FILE          use config file FILE instead of ~/.mtailrc'
-+    print '      --remove-blanks        do not display blank lines'
-     print
-     print 'with more than one filename, mtail will precede each chunk from'
-     print 'each with a header giving the file name. if no filenames are given'
diff --git a/app-misc/mtail/mtail-1.1.1-r2.ebuild b/app-misc/mtail/mtail-1.1.1-r2.ebuild
deleted file mode 100644
index b6fa941fb5ed..000000000000
--- a/app-misc/mtail/mtail-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils python
-
-DESCRIPTION="Tail workalike, that performs output colourising"
-HOMEPAGE="http://matt.immute.net/src/mtail/"
-SRC_URI="http://matt.immute.net/src/mtail/mtail-${PV}.tgz
-	http://matt.immute.net/src/mtail/mtailrc-syslog.sample"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-remove-blanks.patch
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	dobin mtail || die
-	dodoc CHANGES mtailrc.sample README "${DISTDIR}"/mtailrc-syslog.sample || die
-}
diff --git a/app-misc/mtail/mtail-1.1.1-r3.ebuild b/app-misc/mtail/mtail-1.1.1-r3.ebuild
index e39550b60f0d..422847738592 100644
--- a/app-misc/mtail/mtail-1.1.1-r3.ebuild
+++ b/app-misc/mtail/mtail-1.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="http://matt.immute.net/src/mtail/mtail-${PV}.tgz
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=${PYTHON_DEPS}
@@ -26,6 +26,6 @@ src_prepare() {
 }
 
 src_install() {
-	dobin mtail || die
-	dodoc CHANGES mtailrc.sample README "${DISTDIR}"/mtailrc-syslog.sample || die
+	dobin "${PN}"
+	dodoc CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample || die
 }
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 819e0fcde6f0..59bc123540f3 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,2 +1,3 @@
 DIST zsh-completions-0.18.0.tar.gz 232872 SHA256 b94eb63d044920a4ea6d5d51ae4f237f21b0c3174f3c58ff464b5284477cdb7a SHA512 68510ce1823c59318ffa7ff85b3c0385d056912c68e6513fbbcaf49c3757cca69531e7f3dfb5f75424f8bbf3722ebebc00170b10588de619cdd1353d6754d1ac WHIRLPOOL e48a24b3d612b4797264d28c02b4b151dd5f8bdac981ed24a47ce1490d4ce3372dcaae4ac7d9aeb4dd6d0cbe56c5a3752bec2f83561eb9aa23f43816a31d7e1d
 DIST zsh-completions-0.19.0.tar.gz 231152 SHA256 8108692b9f9bfb630b9b96a8ff57e87a9437fd183599972f6b0a60f8552c89e0 SHA512 f105b77a3941caf681861369d32558d0fe54d15761400c3ed8e827c86e924cc5449d03a60a9ff7f7cb5dab275ab2f4b6c6a316f8af8b649eff8c20da0b9b21f6 WHIRLPOOL 4db5e4c178c8c742d01fe49227152e7e427f98d8d29258bc6a1c5b236a91dd7a39ad96da60cf01e7654af2f66696f1d24062acdacef9bbeb5745215cd25f1783
+DIST zsh-completions-0.20.0.tar.gz 193091 SHA256 c697d1d6bd093b5f761f9171a28fa9de2133fee929028bbe5ae2b71352800ad5 SHA512 1b494cc8ce3b549018ca27847a52ff94fd6520a6990c6b65527e34d54cc4ed4e4a17153bb23af50c6dd7a3d236d2389c850fe73e849624f111d5a39143dd7f0f WHIRLPOOL e959894b78224fe1862889838e97f3b85ed3fa9195782acf51a7574e4cf183719e7dc1d11c5d0e340dcea200ee86fe32d808171ce755909669667b6ea03465a5
diff --git a/app-shells/zsh-completions/zsh-completions-0.20.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.20.0.ebuild
new file mode 100644
index 000000000000..e5b1d5f40bc0
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.20.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
+else
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-completions"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins src/_*
+}
+
+pkg_postinst() {
+	elog
+	elog "If you happen to compile your functions, you may need to delete"
+	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
+	elog "to your shell."
+	elog
+}
diff --git a/app-text/aspell/aspell-0.60.6.1-r4.ebuild b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
new file mode 100644
index 000000000000..b040ac6fdbd5
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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 ~x86-solaris"
+IUSE="nls unicode"
+
+PDEPEND="app-dicts/aspell-en"
+LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
+hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	# Need to keep linguas_* for now, since aspell uses gettext
+	IUSE+=" linguas_${lang/-/_}"
+	case ${lang} in
+		de-1901) dict="de-alt"  ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
+done
+unset dict lang LANGS
+
+# English dictionary 0.5 is incompatible with aspell-0.6
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	nls? ( virtual/libintl )
+	!=app-dicts/aspell-en-0.5*
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.5-nls.patch"
+	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+	# includes fix for bug #467602
+	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+)
+
+src_prepare() {
+	default
+
+	rm m4/lt* m4/libtool.m4 || die
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable unicode) \
+		--disable-static \
+		--sysconfdir="${EPREFIX}"/etc/aspell
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# install ispell/aspell compatibility scripts
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	# we explicitly pass '--disable-static' to econf,
+	# hence we can delete .la files unconditionally
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/aspell/files/aspell-0.60.5-solaris.patch b/app-text/aspell/files/aspell-0.60.5-solaris.patch
index fc1920a4f57a..1cfc5f3e6caa 100644
--- a/app-text/aspell/files/aspell-0.60.5-solaris.patch
+++ b/app-text/aspell/files/aspell-0.60.5-solaris.patch
@@ -1,8 +1,8 @@
 * grobian@gentoo.org: on Solaris 10 _XOPEN_SOURCE_EXTENDED may not be
   defined when including wchar.h with g++
 
---- prog/check_funs.cpp
-+++ prog/check_funs.cpp
+--- a/prog/check_funs.cpp
++++ b/prog/check_funs.cpp
 @@ -18,10 +18,6 @@
  
  #include "settings.h"
diff --git a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
index 39178587f685..84e05833d9d8 100644
--- a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
+++ b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
@@ -5,8 +5,8 @@ Apple suggests using .bundle.  libtool on Gentoo generates .bundle files
 for modules on Darwin, so we need aspell to actually look for .bundle,
 not .so.
 
---- lib/new_filter.cpp
-+++ lib/new_filter.cpp
+--- a/lib/new_filter.cpp
++++ b/lib/new_filter.cpp
 @@ -458,11 +458,23 @@
        module->file.assign(option_file.str(), slash + 1 - option_file.str());
        //module->file += "lib";
diff --git a/app-text/aspell/files/aspell-0.60.6.1-clang.patch b/app-text/aspell/files/aspell-0.60.6.1-clang.patch
index 76cfaa868e31..8d3e62dcdf0b 100644
--- a/app-text/aspell/files/aspell-0.60.6.1-clang.patch
+++ b/app-text/aspell/files/aspell-0.60.6.1-clang.patch
@@ -1,6 +1,6 @@
 From https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=180565
---- interfaces/cc/aspell.h.orig	2011-07-02 17:53:27.000000000 -0400
-+++ interfaces/cc/aspell.h	2015-07-29 11:23:32.000000000 -0400
+--- a/interfaces/cc/aspell.h
++++ b/interfaces/cc/aspell.h
 @@ -237,6 +237,7 @@
  /******************************** errors ********************************/
  
@@ -17,8 +17,8 @@ From https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=180565
  
  
  /******************************* speller *******************************/
---- prog/aspell.cpp.orig	2011-07-04 05:13:58.000000000 -0400
-+++ prog/aspell.cpp	2015-07-29 11:22:57.000000000 -0400
+--- a/prog/aspell.cpp
++++ b/prog/aspell.cpp
 @@ -25,6 +25,7 @@
  # include <langinfo.h>
  #endif
@@ -35,8 +35,8 @@ From https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=180565
  #include "file_util.hpp"
  #include "fstream.hpp"
  #include "info.hpp"
---- prog/checker_string.hpp.orig	2011-07-02 17:09:09.000000000 -0400
-+++ prog/checker_string.hpp	2015-07-29 11:24:50.000000000 -0400
+--- a/prog/checker_string.hpp
++++ b/prog/checker_string.hpp
 @@ -6,6 +6,7 @@
  
  #include <stdio.h>
diff --git a/app-text/aspell/files/aspell-0.60.6.1-unicode.patch b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch
new file mode 100644
index 000000000000..8e1957c727a9
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch
@@ -0,0 +1,276 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ AC_CONFIG_SRCDIR(prog/aspell.cpp)
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(gen/settings.h)
++AC_CONFIG_HEADERS([gen/settings.h])
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -52,14 +52,11 @@
+ AC_ARG_ENABLE(win32-relocatable,
+   [  --enable-win32-relocatable])
+ 
+-AC_ARG_ENABLE(curses,           
+-  AS_HELP_STRING([--enable-curses=LIBFILE],[cursor control library]))
++AC_ARG_ENABLE([curses],
++  AS_HELP_STRING([--enable-curses],[cursor control library]))
+ 
+-AC_ARG_ENABLE(curses-include,           
+-  [  --enable-curses-include=DIR])
+-
+-AC_ARG_ENABLE(wide-curses,
+-  AS_HELP_STRING([--disable-wide-curses],[disable wide char utf8 cursor control]))
++AC_ARG_ENABLE([unicode],
++  AS_HELP_STRING([--enable-unicode],[enable Unicode support]))
+ 
+ AC_ARG_ENABLE(regex,
+   [  --disable-regex])
+@@ -312,197 +309,18 @@
+   [AC_MSG_RESULT(no)]
+ )
+ 
+-AC_SUBST(CURSES_LIB)
+-AC_SUBST(CURSES_INCLUDE)
+-
+-if test "$enable_curses" != "no"
+-then
+-  use_curses=t
+-  case "$enable_curses" in
+-    yes | ""                     )                             ;;
+-    /* | *lib* | *.a | -l* | -L* ) CURSES_LIB="$enable_curses" ;;
+-    *                            ) CURSES_LIB=-l$enable_curses ;;
+-  esac
+-  case "$enable_curses_include" in
+-    yes | no | "")                                         ;;
+-    -I*          ) CURSES_INCLUDE="$enable_curses_include" ;;
+-    *            ) CURSES_INCLUDE=-I$enable_curses_include ;;
+-  esac
+-fi
+-
+-if test "$use_curses"
+-then
+-
+-  ORIG_LIBS="$LIBS"
+-  ORIG_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="$CURSES_INCLUDE $ORIG_CPPFLAGS"
+-
+-  if test -z "$CURSES_LIB"
+-  then
+-
+-    AC_MSG_CHECKING(for working curses library)
+-
+-    if test "$enable_wide_curses" != "no" -a -n "$have_mblen"
+-    then
+-      LIBS="-lncursesw $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <ncursesw/curses.h>], [initscr()],
+-        [CURSES_LIB=-lncursesw
+-         AC_DEFINE(CURSES_HEADER, <ncursesw/curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <ncursesw/term.h>, [Defined to term header file])])
+-    fi
+-
+-    if test -z "$CURSES_LIB"
+-    then
+-      LIBS="-lncurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <ncurses/curses.h>], [initscr()],
+-        [CURSES_LIB=-lncurses
+-         AC_DEFINE(CURSES_HEADER, <ncurses/curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <ncurses/term.h>, [Defined to term header file])],
+-        [
+-      LIBS="-lncurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <ncurses.h>], [initscr()],
+-        [CURSES_LIB=-lncurses
+-         AC_DEFINE(CURSES_HEADER, <ncurses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
+-        [
+-      LIBS="-lcurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <curses.h>], [initscr()],
+-        [CURSES_LIB=-lcurses
+-         AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
+-        [
+-      LIBS="-lncurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <curses.h>], [initscr()],
+-        [CURSES_LIB=-lncurses
+-         AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
+-      ) ]) ]) ])
+-    fi
+-
+-    if test -n "$CURSES_LIB"
+-    then
+-      AC_MSG_RESULT([found in $CURSES_LIB])
+-    else
+-      AC_MSG_RESULT([not found])
+-    fi
+-
+-  else
+-
+-    AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
+-    AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])
+-
+-  fi
+-
+-  if test -n "$CURSES_LIB"
+-  then
+-     LIBS="$CURSES_LIB $ORIG_LIBS"
+-
+-     if test "$enable_wide_curses" != "no"
+-     then
+-
+-       AC_MSG_CHECKING(for wide character support in curses libraray)
+-       if test -n "$have_mblen"
+-       then
+-         AC_TRY_LINK(
+-           [#include <wchar.h>
+-            #include CURSES_HEADER
+-           ],
+-           [wchar_t wch = 0;
+-            addnwstr(&wch, 1);],
+-           [AC_MSG_RESULT(yes)
+-            AC_DEFINE(HAVE_WIDE_CURSES, 1, [Defined if curses libraray includes wide character support])],
+-           [
+-
+-         AC_TRY_LINK(
+-           [#define _XOPEN_SOURCE_EXTENDED 1
+-            #include <wchar.h>
+-            #include CURSES_HEADER
+-           ],
+-           [wchar_t wch = 0;
+-            addnwstr(&wch, 1);],
+-           [AC_MSG_RESULT(yes)
+-            AC_DEFINE(HAVE_WIDE_CURSES, 1)
+-            AC_DEFINE(DEFINE_XOPEN_SOURCE_EXTENDED, 1, 
+-                      [Defined if _XOPEN_SOURCE_EXTENDED needs to be defined. 
+-                       (Can't define globally as that will cause problems with some systems)])
+-           ],
+-           [AC_MSG_RESULT(no)
+-            AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])])])
+-       else
+-         AC_MSG_RESULT([no, because "mblen" is not supported])
+-         AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])
+-       fi
+-
+-     fi
+- 
+-     AC_MSG_CHECKING(if standard curses include sequence will work)
+-     AC_TRY_LINK(
+-       [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
+-        #  define _XOPEN_SOURCE_EXTENDED 1
+-        #endif
+-        #include <termios.h>
+-	#include <unistd.h>
+-        #include CURSES_HEADER
+-	#include TERM_HEADER
+-       ],
+-       [tigetstr(const_cast<char *>("cup"));],
+-       [AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_LIBCURSES, 1, 
+-                  [Defined if the curses library is available])
+-	posix_termios=t
+-	AC_DEFINE(CURSES_INCLUDE_STANDARD, 1, 
+-                  [Defined if no special Workarounds are needed for Curses headers])],
+-       [AC_MSG_RESULT(no)
+-
+-     dnl else if
+-     AC_MSG_CHECKING(if curses workaround I will work)
+-     AC_TRY_LINK(
+-       [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
+-        #  define _XOPEN_SOURCE_EXTENDED 1
+-        #endif
+-        #include <termios.h>
+-	#include <unistd.h>
+-        #include CURSES_HEADER
+-	extern "C" {char * tigetstr(char * capname);}],
+-       [tigetstr(const_cast<char *>("cup"));],
+-       [AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_LIBCURSES, 1, [])
+-        posix_termios=t
+-	AC_DEFINE(CURSES_INCLUDE_WORKAROUND_1, 1, 
+-                  [Defined if special Wordaround I is need for Curses headers])],
+-       [AC_MSG_RESULT(no)
+-
+-     dnl else if
+-     AC_MSG_CHECKING(if curses without Unix stuff will work)
+-     AC_TRY_LINK(
+-       [#include CURSES_HEADER
+-       ],
+-       [initscr();],
+-       [AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_LIBCURSES, 1, [])
+-	AC_DEFINE(CURSES_ONLY, 1, 
+-                  [Defined if curses like POSIX Functions should be used])
+-        curses_only=t],
+-       [AC_MSG_RESULT(no)
+-
+-     dnl else
+-     use_curses=false
+-     CURSES_LIBS=""
+-     CURSES_INCLUDE=""
+-
+-     ]) ]) ])
+-
+-  fi
+-
+-  CPPFLAGS="$ORIG_CPPFLAGS"
+-  LIBS="$ORIG_LIBS"
+-
+-fi
++AS_IF([test "x$enable_curses" != "xno"],[
++  AS_IF([test "x$enable_unicode" != "xno"],
++    [AC_DEFINE([HAVE_WIDE_CURSES], [1], [Defined if curses library includes wide character support])
++     ncurses_library="ncursesw"],
++    [ncurses_library="ncurses"])
++
++  PKG_CHECK_MODULES([NCURSES], ["$ncurses_library"])
++
++  AC_DEFINE([HAVE_LIBCURSES], [1], [Defined if the curses library is available])
++  AC_DEFINE([CURSES_INCLUDE_STANDARD], [1], [Defined if no special Workarounds are needed for Curses headers])
++  posix_termios=t
++])
+ 
+ if test -z "$posix_termios" -a -z "$curses_only"
+ then
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -121,7 +121,7 @@
+ # Aspell Program
+ #
+ 
+-AM_CPPFLAGS += -DLOCALEDIR="$(localedir)"
++AM_CPPFLAGS += -DLOCALEDIR="$(localedir)" $(NCURSES_CFLAGS)
+ 
+ bin_PROGRAMS = word-list-compress aspell prezip-bin
+ 
+@@ -129,7 +129,7 @@
+ 
+ aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
+ 
+-aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL)
++aspell_LDADD = libaspell.la $(NCURSES_LIBS) $(LTLIBINTL)
+ 
+ prezip_bin_SOURCES = prog/prezip.c
+ 
+--- a/prog/check_funs.cpp
++++ b/prog/check_funs.cpp
+@@ -62,11 +62,11 @@
+ 
+ #if HAVE_LIBCURSES
+ 
+-#include CURSES_HEADER
++#include <curses.h>
+ 
+ #if CURSES_INCLUDE_STANDARD
+ 
+-#include TERM_HEADER
++#include <term.h>
+ 
+ #elif CURSES_INCLUDE_WORKAROUND_1
+ 
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index d15fa83cc72e..245124f38d41 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,3 @@
 DIST iso-codes-3.63.tar.xz 3773672 SHA256 60600e56952dc92b3a8cd8a7044348f7cfa35be528bab2491c3c18582fb5277f SHA512 31b5142611e2050a9bfb95cd12d962b8cbe01824f1202e70ca40d9cd178a5fd17557eac3fcc59dd0b94baf2656caeef09c50332cd2a8d0e1bb14c82c154e06ae WHIRLPOOL bbe3c5474ba3fc22243a9b6bea9c6b43dccd5a2230ee59b07e4484e06ccba4be977dfa1e16014b18d4cae5393a50099e3a12b13747e9970c4e605df8b4e002be
-DIST iso-codes-3.65.tar.xz 3732432 SHA256 834de5193c8489eedeaf6509457a9b13476702386ae1f3ed4f391a349d630320 SHA512 cf88397150b3014a4f5e4d709cbc1e00537c9289ea68d68ec9b24df6c7467fda3fe99fbeacd444837d614ae1df213816a3996a9e86aac400f9d92a0a3090f8ab WHIRLPOOL b506fea95bba3ecf40e9d1e4d5c26d4fd97e88203fdf1e931269642b42daca93b5b479b52a4e2807de4dc80b3233599394dc67f6762bf00caf5689a74fd36e4c
 DIST iso-codes-3.68.tar.xz 3448584 SHA256 5881cf7caa5adfffb14ade99138949324c28a277babe8d07dafbff521acef9d1 SHA512 77abd3437fe66635cf52dbe065def9ff229a4bce20eb1167ccc825c934db57b4acc8112f99bdca6313324d850549cd9ead7556e0540c2b4e80cad9715613cec2 WHIRLPOOL 5b905d4711ea5f3af29418829bcfbb94172336f548e125005a15f5e8963bee55f21d6c44542037d006bee06748db13f8a30b8474163c0bfa816dca9fa9e46ed5
+DIST iso-codes-3.70.tar.xz 3452288 SHA256 41e2fbaec2ed57e767b94f175d0dcd31b627aeb23b75cd604605a6fb6109d61f SHA512 59238008b320a739afd1cdf689f2c163d233e3fadfe9ab038bdad2502e866185867edab9f46fd078a6d46f4431267e614d0dd3b597ba17fdda95004bbaf5dd4a WHIRLPOOL e9a5dab29699386be3c3a2b16e925aa4741c260a782b2fbb88ef180682feb9f05dc6f0b88920a00c299f671677de0f5d19e61a88c9b0299c7e566a732125ab79
diff --git a/app-text/iso-codes/iso-codes-3.63.ebuild b/app-text/iso-codes/iso-codes-3.63.ebuild
index 0163e1eff63a..4e3835443862 100644
--- a/app-text/iso-codes/iso-codes-3.63.ebuild
+++ b/app-text/iso-codes/iso-codes-3.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="ia64 sparc"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/iso-codes/iso-codes-3.65.ebuild b/app-text/iso-codes/iso-codes-3.65.ebuild
deleted file mode 100644
index 1d51de649f42..000000000000
--- a/app-text/iso-codes/iso-codes-3.65.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	local norm loc all_locales mylinguas
-	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
-
-	# l10n_find_plocales_changes doesn't support multiple directories
-	einfo "Looking for new locales ..."
-	for norm in ${all_norms}; do
-		pushd "${norm}" > /dev/null || die
-		for loc in *.po; do
-			all_locales+="${loc%.po} "
-		done
-		popd > /dev/null
-	done
-
-	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
-	all_locales=${all_locales//[[:space:]]/ }
-	all_locales=${all_locales#[[:space:]]}
-	all_locales=${all_locales%[[:space:]]}
-	if [[ ${PLOCALES} != ${all_locales} ]]; then
-		einfo "There are changes in locales! This ebuild should be updated to:"
-		einfo "PLOCALES=\"${all_locales}\""
-	else
-		einfo "Done"
-	fi
-
-	for norm in ${all_norms}; do
-		einfo "Preparing ${norm} ..."
-		pushd "${norm}" > /dev/null || die
-		mylinguas=
-		for loc in *.po; do
-			if use "linguas_"${loc%.po}; then
-				mylinguas+="${loc} "
-			fi
-		done
-
-		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
-			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
-			-i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
-		popd > /dev/null
-	done
-}
diff --git a/app-text/iso-codes/iso-codes-3.70.ebuild b/app-text/iso-codes/iso-codes-3.70.ebuild
new file mode 100644
index 000000000000..e6010bfc3e6a
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.70.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5} )
+PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+# l10n_find_plocales_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if use "linguas_${loc%.po}"; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/rpl/rpl-1.5.5-r1.ebuild b/app-text/rpl/rpl-1.5.5-r1.ebuild
index 009a127997f6..f35fda5ee871 100644
--- a/app-text/rpl/rpl-1.5.5-r1.ebuild
+++ b/app-text/rpl/rpl-1.5.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 python_prepare_all() {
diff --git a/app-text/rpl/rpl-1.5.5.ebuild b/app-text/rpl/rpl-1.5.5.ebuild
deleted file mode 100644
index 25d42834e2f8..000000000000
--- a/app-text/rpl/rpl-1.5.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Intelligent recursive search/replace utility"
-HOMEPAGE="http://rpl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-src_install() {
-	distutils_src_install
-	doman ${PN}.1 || die
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 87058b51419c..974181917306 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,3 @@
 DIST Sigil-0.9.5-Code.zip 19224845 SHA256 fd9963c4e5b9013bd95ed0659dbc5e67c9848982800f2ec99bf96bbdfb708ff1 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625 WHIRLPOOL 8ec15cb19175097b4bd0613139366d58a5fd0c01259e3cfb9203d585e009f1207ba3e9b68cd5213793c8309f9e18720ac9eec674d820947833a90dbcc6dcc3d5
+DIST Sigil-0.9.6-Code.zip 19307454 SHA256 7856ad20116ef13fc3f79fa01c1d65c8b15ce1047f1e88b0723c2658cd8f18fd SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417 WHIRLPOOL d74290b59247ced4977bf575adb93c7a76a8045f464b649854e49f6028cb2a9fb28c50fc36d00d3ab106768a85c514b5df5252e5172597a6120913a051b9cca7
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
diff --git a/app-text/sigil/sigil-0.9.5-r1.ebuild b/app-text/sigil/sigil-0.9.5-r2.ebuild
similarity index 98%
rename from app-text/sigil/sigil-0.9.5-r1.ebuild
rename to app-text/sigil/sigil-0.9.5-r2.ebuild
index f07c6136ba25..911c27f69716 100644
--- a/app-text/sigil/sigil-0.9.5-r1.ebuild
+++ b/app-text/sigil/sigil-0.9.5-r2.ebuild
@@ -39,6 +39,7 @@ RDEPEND="
 	>=dev-qt/qtprintsupport-5.4:5
 	>=dev-qt/qtwebkit-5.4:5
 	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
 	sys-libs/zlib[minizip]
 "
 DEPEND="${RDEPEND}
diff --git a/app-text/sigil/sigil-0.9.6.ebuild b/app-text/sigil/sigil-0.9.6.ebuild
new file mode 100644
index 000000000000..911c27f69716
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MIN_VERSION="3.0"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit cmake-utils python-single-r1
+
+my_pn="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/hunspell
+	dev-libs/boost[threads]
+	dev-libs/libpcre[pcre16]
+	dev-libs/xerces-c[icu]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8
+	virtual/pkgconfig
+	>=dev-qt/linguist-tools-5.4:5
+	app-arch/unzip
+"
+
+S="${WORKDIR}"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_prepare() {
+	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+	eapply "${FILESDIR}/sigil-0.9.4-proper-gumbo-install.patch"
+
+	eapply_user
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DLIBDIR="$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "From Sigil's release notes:"
+	elog "When you fire up Sigil for the very first time:"
+	elog "navigate to the new General Preferences and select the default"
+	elog "epub version you plan to work with (epub 2 or epub3) so that new"
+	elog "empty ebooks start with the correct code."
+	elog "if you plan to work with epub3 epubs, you should change your"
+	elog "PreserveEntities setting to use ONLY NUMERIC entities."
+	elog ""
+	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
+	elog ""
+	elog "We strongly recommend enabling Mend On Open in your settings"
+	elog "for best performance with Sigil."
+}
diff --git a/app-text/tesseract/tesseract-3.04.00-r4.ebuild b/app-text/tesseract/tesseract-3.04.00-r4.ebuild
deleted file mode 100644
index 0d73d88a737e..000000000000
--- a/app-text/tesseract/tesseract-3.04.00-r4.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="tesseract-ocr"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit eutils autotools java-pkg-opt-2
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${PV}
-	doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${PV} )
-	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${PV} )
-	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${PV} )
-	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${PV} )
-	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${PV} )
-	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${PV} )
-	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${PV}
-			   ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${PV} )
-	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${PV}
-			   ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${PV} )
-	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${PV} )
-	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${PV} )
-	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${PV} )
-	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${PV} )
-	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${PV} )
-	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${PV} )
-	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${PV} )
-	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${PV} )
-	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${PV} )
-	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${PV} )
-	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${PV} )
-	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${PV} )
-	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${PV} )
-	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${PV} )
-	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${PV} )
-	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${PV} )
-	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${PV} )
-	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${PV} )
-	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${PV} )
-	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${PV}
-			   ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${PV} )
-	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${PV} )
-	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${PV} )
-	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${PV} )
-	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${PV} )
-	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${PV} )
-	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${PV} )
-	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${PV} )
-	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${PV} )
-	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${PV} )
-	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${PV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${PV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)
-"
-
-DEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
-
-PATCHES=(
-	"${FILESDIR}/tesseract-2.04-gcc47.patch"
-	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
-	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
-	"${FILESDIR}/${P}-leptonica-1.73-compat.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
-	find "${DISTDIR}/" -name "*traineddata-${PV}" \
-		 -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable opencl)
-		$(use_enable scrollview graphics)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
-	use training && emake training
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}/${MY_PN}"/doc/html/*
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
-}
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index a1251e1efb4f..dafb12aa2618 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,2 +1,2 @@
-DIST libxml++-2.38.1.tar.xz 947556 SHA256 882529189b03db6c69925b3f579ab1941feb4f02b5fe2612504ee7e498a4a05f SHA512 d60f283ca2a056bf81fd6083c10dd9d469bb62dcb06ded9ea3549bc1d0053ed14f47bd86394761825f69d9d0f3a02781f1fd121244b9ce8f9637ad21e0d177f8 WHIRLPOOL 92b4222bd1626e4e5baa6dbf1ff8479a594a49fe04bbc3279e1c2da41dd0c6e12b57e5d5eaa295f3f6361af53f2288eb9e2cb31dbdbd8e781178717327a5069c
 DIST libxml++-2.40.1.tar.xz 955220 SHA256 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9 SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a WHIRLPOOL f1888bc6f90dd10dea04f617f317a2eed79f2c4981e03b1fbdb3cefcc4bfeadc256c5dd6163d82b7b33cb29d8d15de98de822d2d40f3fa8e8851efe827cdff72
+DIST libxml++-3.0.0.tar.xz 934588 SHA256 2ff3640417729d357bada2e3049061642e0b078c323a8e0d37ae68df96547952 SHA512 5474006bd0e473b999f0d27e31e06d6509ce009f479d74c0114cde96858706318ba7367e0652a91b3a567c00b73e53dee4f951beb81dfb3ba42412fb21eec1de WHIRLPOOL bd6a1c905b7bae4ad15be7b3f23d0aed28262c9c5b1fff744b27fc1c01a9ff3a2f8ca66dca54ad2e607aeab688d24de57ae90c39990a3a9e29839ae79182d1c2
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.38.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-3.0.0.ebuild
similarity index 80%
rename from dev-cpp/libxmlpp/libxmlpp-2.38.1.ebuild
rename to dev-cpp/libxmlpp/libxmlpp-3.0.0.ebuild
index c14533256cd3..69ec17c28922 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.38.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-3.0.0.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
 GNOME_ORG_MODULE="${PN/pp/++}"
 
 inherit gnome2 multilib-minimal
@@ -12,8 +11,8 @@ DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
 HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="
@@ -21,7 +20,7 @@ RDEPEND="
 	>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
 multilib_src_prepare() {
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 4256f1621287..cca447da05ad 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1 +1,2 @@
 DIST cache_tab-1.0.2.tar.gz 12414 SHA256 f44bd4ee2136b6d2dfbb34c523aad973b8e4ee53568cae2e29cf780833052940 SHA512 9a4e225b4a1776771d964ef2b96b8eb976b930bb2e9c5ac93e1e8b238f6e259d086a550d41b4931fbde293306892cdde2a38a4af3afa581a74e9e76b5feef111 WHIRLPOOL 06f5bad8c41d8a7f8269cb598d9abcf583298dc3d326dbb0f5405ae05d4fba19141c93885d4b44b3c0efa0d98e4d2039e7eba9e186d49b0dfdc2b4c3aea3279c
+DIST cache_tab-1.0.3.tar.gz 12600 SHA256 7cfd4736f2939b9c87aea050882af16ebfcf2d18c8ad2ff9fa2fc741c6afe2c5 SHA512 d6d6f23834144b58a590dcbda57c2f0d14fd6030a2ea1e1675d56ac1038618f275bb9f9f9c0f80fc03510f775c1a04637eebcf927daeb9af51e2c70efa8239f4 WHIRLPOOL eb9faffc08dbdb8881f9c3bb9aaa598ce7df8429c9c3b972b97f9a573a8eea37225b3c4af30af312e539648ad1c5276cd156233b2fcd25fddf0802aeaeebfe89
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild
new file mode 100644
index 000000000000..7eb6a68cf81a
--- /dev/null
+++ b/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="In-memory cache Erlang and Elixir library"
+HOMEPAGE="https://github.com/processone/cache_tab"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index 0ee017ef9c20..ff9a4b625419 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1 +1,2 @@
 DIST esip-1.0.4.tar.gz 84478 SHA256 f10e59d06a7764c97f1dc474a99334d532b06c5f2125445f21757016f3ff8cc6 SHA512 50915831796f76986a00f5a2a08f308aa9fee71e92fbb6978e9e20f0c00007c0d442991cc7fc2f6df82560a1509f8189865afe8d0b6f94410c39e07ca4f1092b WHIRLPOOL 74a625a03f39d5c78b0e5a8516c0fe6d8c4e441674c2ffce9fa89609b8a6045bd52916753bdfa2c55d055bbead9e6e727adabbb9f98d388f746308c328f1db93
+DIST esip-1.0.7.tar.gz 84522 SHA256 942622cb808978d7eb0f2faa3c6b1577579bf9faa8617d9db58a9b7fe7a59993 SHA512 f25f2ea146a8fbea8f727210fc222649a6d434b5f2f9c2eaab62d56ecaddcd2f2986a96befb1e1291cff9130276d146321c20948d0469c36797c323f94431f3a WHIRLPOOL bdd25e89e32e742508cf58b4321e382e3c7fe6e0cf8ce7128c39ea1270162930eebf6f88bdfcfac65470c8193b87ef01e38aff8bccc310e1fd4f7c5f5adc078d
diff --git a/dev-erlang/esip/esip-1.0.4.ebuild b/dev-erlang/esip/esip-1.0.4.ebuild
index 91d1a5ea290a..6893710242de 100644
--- a/dev-erlang/esip/esip-1.0.4.ebuild
+++ b/dev-erlang/esip/esip-1.0.4.ebuild
@@ -28,5 +28,5 @@ src_prepare() {
 	rebar_fix_include_path stun
 
 	# ebin contains lonely .gitignore file asking for removal.
-	rm -r "${S}/ebin"
+	rm -r "${S}/ebin" || die
 }
diff --git a/dev-erlang/esip/esip-1.0.7.ebuild b/dev-erlang/esip/esip-1.0.7.ebuild
new file mode 100644
index 000000000000..f0712f53f7dc
--- /dev/null
+++ b/dev-erlang/esip/esip-1.0.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.0.6
+	>=dev-erlang/stun-1.0.6
+	>=dev-erlang/p1_utils-1.0.4
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path stun
+
+	# ebin contains lonely .gitignore file asking for removal.
+	rm -r "${S}/ebin" || die
+}
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index 50da96b82f44..3da9178220cb 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1 +1,2 @@
 DIST fast_tls-1.0.3.tar.gz 57470 SHA256 530f18fee1571fecab3ff75d5dd4d2e94472c892a1b5dba048412ed9b1ec449d SHA512 701016ce045fcd13810f2c287772cc2828576b85bd1458227d9da9ce89c3e10e75c41a02eb78f6e1c155dd75b76ad3d3becf5b40832b1e1b4cf928488e3bdb04 WHIRLPOOL 736ffb0ef419cdb417f7bec4c9a1980072af7e06db4cb0cdb37eb83ff53fc618627b87c167a62dd1daa4db629902aff78780df335505eb9c1ba73a6f8bd67551
+DIST fast_tls-1.0.6.tar.gz 57994 SHA256 96c3ede9fbdcad510865e1a1759901556fa004d51d81a45d4d24031127feee8f SHA512 d13a5758345521c9a295f6bb4aeedc58ea7fafb42ea3955ca61cb75e15c8755c7a331d139f2c544da9e8d23607a6520caf8fe1e1fad7c016acbca07c0d783fb8 WHIRLPOOL e69cfb8901e07e78ab308ce0ceac02167ead6c667465a8e386717509385c998d1e50f2a8b331c3887fbcdd990b958861f8b3e1e3e2e80a42598cbf07f66fc691
diff --git a/dev-erlang/fast_tls/fast_tls-1.0.6.ebuild b/dev-erlang/fast_tls/fast_tls-1.0.6.ebuild
new file mode 100644
index 000000000000..822a641a030d
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.0.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+	>=dev-lang/erlang-17.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index 39ba5f4348f8..e75ed7667fd3 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -1 +1,2 @@
+DIST fast_xml-1.1.14.tar.gz 86918 SHA256 84be7134c6bb9deaadc28000fa957e34750af51abcc67dd908f2ebc528b4c899 SHA512 3475d5cc5ab670cade221b5ffb610d2dbc52d9699e8d32d17eb3b13da1a486d8351776a50284cdd37ee9d4b6606221c60928f836669a325cb1692290a88d5d1e WHIRLPOOL d05b49323b4d5fc83cea685a36c577faa397d606aeb9ca1e2e450442fd7fed19c22bd7d33e1ef9495b9e2798ea259cb32fcdc704c5227be3009b5d75aa07a120
 DIST fast_xml-1.1.3.tar.gz 84926 SHA256 59de96e3defc02c9b916d4cc02545cd963c282266a09ce248ac6b6be4b2347ae SHA512 644934d6538ddf2b49863883a66255966b47f933594aff10325dca7785802d28d3223f79941fb4cfa33776e5a1a5fa74fe84422b7077241fb33fff1c52bd044a WHIRLPOOL 0361480089f055f2cb5afd2662072e9bf12ebfc651fc2dd242feb9797ff805a3b4956a8169fdc513c41b4d6142894a964e4d361d97f39c68ba3526a0d9ad1e51
diff --git a/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild
new file mode 100644
index 000000000000..346046e877f1
--- /dev/null
+++ b/dev-erlang/fast_xml/fast_xml-1.1.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Expat based Erlang XML parsing library"
+HOMEPAGE="https://github.com/processone/fast_xml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-erlang/p1_utils-1.0.4
+	>=dev-lang/erlang-17.1
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/elixir-1.1 )"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index 970333ce3688..fb11c78d8b0f 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1 +1,2 @@
 DIST fast_yaml-1.0.3.tar.gz 49351 SHA256 1ece4a9396c7595c0bd0a4e82a81a6680327efa1fcb9e6d0b85ae06fbb2ac856 SHA512 321de1c0ff830de8a556bd661e600a66bccd944d6503a87a02111bcfb0b23c8c60b128296e7bb07ea39f923a04ebc7cd15e33971ca6691f16a75340c0695aee9 WHIRLPOOL d46238885a7dc80312523a105126d62fa80489d86d8c8be86e36d10e596a566caf86f3ca2d0e458dc6e8481a272c45a9392ff6057d8c9291392a7d038a6085cb
+DIST fast_yaml-1.0.5.tar.gz 49463 SHA256 5286be45f91c8b084a582fe545ee86e2f33dc466cdd308357596186d1b78496c SHA512 9d6b173f6086b2543273493cca460f161d16a4c3cfd8f84945a7040991fecd24a193bf0af47f3d0a326d2ebea3d46fcf5cfa0ff21607ee98e9a0bb6f2a535bab WHIRLPOOL dc505924f1df58ea1a78f0bb1662cbd1f4ee3d20b238a753699df33c0e4ccd3c48e28d94ec8366f1a6c08f5e63a7f1d3b4dcaa4755e4af2924f6ae89e01de450
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild
new file mode 100644
index 000000000000..b20489f1a83a
--- /dev/null
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+	>=dev-lang/erlang-17.1
+	dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild b/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
index 30b39fcb7289..ae1dd0301216 100644
--- a/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
+++ b/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
@@ -28,5 +28,5 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	rebar_src_prepare
 	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv"
+	rm -r "${S}/priv" || die
 }
diff --git a/dev-erlang/hamcrest/Manifest b/dev-erlang/hamcrest/Manifest
index 6c1d4a442400..4eb943b171fe 100644
--- a/dev-erlang/hamcrest/Manifest
+++ b/dev-erlang/hamcrest/Manifest
@@ -1 +1,2 @@
 DIST hamcrest-0.1.0_p20150103.tar.gz 160516 SHA256 4d218370ab4f557636dc4867f5996637e1cfdbc6e5b6d0703591c9be1b8a0860 SHA512 d7ed0db598f15e5a2724c31d35a2e34ca55ff37d715c1e8a4b35fd438567f1ae2c4d266dee7215690e8508f77f625a551b7ecbef06582a9ffddb9d14d895fab8 WHIRLPOOL 4a8af0847ed2586e8038a62c178afcf69e48ae258c5d430824e28315c2beefa7abf9a68bff03959c4793e2738a6aeec7318133c11784e217bb3d6464705a91bf
+DIST hamcrest-0.1.0_p20160709.tar.gz 160574 SHA256 228b7e3f5f2223c979da7e50a2325a1269a7b797a89d42d3c210a94c6fbe98e4 SHA512 a1d162e72019bcd56c3f1c486e65b7f788e69a1a2985e5500920565bf6c40b6dd7b920e720ffc8da81cac3b1919124b8defadec2fcef5b27585e63da3abd852e WHIRLPOOL 645a8e617bea88deb7141075a8996db748ec59aeb37a6a4378368910574da57c60049e97fe944c307d0f058bf3df82b64f1dcd471db5588025f2396dbcec4327
diff --git a/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild b/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild
new file mode 100644
index 000000000000..0643eff53f71
--- /dev/null
+++ b/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang port of Hamcrest"
+HOMEPAGE="https://github.com/hyperthunk/hamcrest-erlang"
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-lang/erlang-17.1"
+DEPEND="${CDEPEND}
+	test? ( >=dev-erlang/proper-1.2 )"
+RDEPEND="${CDEPEND}"
+
+DOCS=( NOTES  README.markdown TODO.md )
+
+# Override with EAPI default because it's missing hamcrest.app.src and doesn't
+# have any deps.
+src_prepare() {
+	default
+}
+
+src_test() {
+	rebar_remove_deps test.config
+	erebar -C test.config compile ct
+}
diff --git a/dev-erlang/iconv/Manifest b/dev-erlang/iconv/Manifest
index 9c3d1f275a82..97d775c5a99a 100644
--- a/dev-erlang/iconv/Manifest
+++ b/dev-erlang/iconv/Manifest
@@ -1 +1,2 @@
 DIST iconv-1.0.0.tar.gz 91905 SHA256 b964bc7a561852a6123f732203a67262c07b392cf201b4a2b1bf48d0cb1c4964 SHA512 858ec07e2a8c2699c553de068451dc6dacf3fb1cf8a8e6727a746b72b191b5647a75a5b01443719a8625c1328c6b502a1f51fc1d367767e71792e38e1e34c1f1 WHIRLPOOL 3d072e869b39c87134f35e123de9fca9d3f3cad14d389186e86e5bfe0fa19760e9c009a3f8e21694140d50a429c9ac9d42e0b6efa5bfdc5032252eeaca2673f7
+DIST iconv-1.0.1.tar.gz 121318 SHA256 ee966275028efa246ad21a798c4e0d6394a35a351b2f4071e11d2d691e577731 SHA512 bbccdc206c027e43a13388fc6c23ae5cd7084686ad56e39593b4a3db2abfe89e8000d2a88706d4b083b21e1399d5e7a527e72fa83c7f5e631ad39c8d39293bc1 WHIRLPOOL 788effaa1eaa6d818fb78fe0757e3967738730c5237776a6d5252d427a06b5672ad78047cbe0a52595872754ea598ab76c826854baf3a1aca6a9c4140538fa76
diff --git a/dev-erlang/iconv/iconv-1.0.1.ebuild b/dev-erlang/iconv/iconv-1.0.1.ebuild
new file mode 100644
index 000000000000..4bc4391145a3
--- /dev/null
+++ b/dev-erlang/iconv/iconv-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/iconv"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/lager/Manifest b/dev-erlang/lager/Manifest
index a8c6ab75913c..271ba83a3317 100644
--- a/dev-erlang/lager/Manifest
+++ b/dev-erlang/lager/Manifest
@@ -1 +1,2 @@
 DIST lager-3.2.0.tar.gz 244340 SHA256 cdb1c17217497ee12175f76aacbcf0346902de4da225b08cefa6015504b48c13 SHA512 136274c8d1715d996b599317e4ac02e597c084351d3f7aea806ed9f0236a47c41dfff0b42a989dd4b6404e75e66b334600643aaec20d182edc9504d123920092 WHIRLPOOL 05a6b9f1423ca313d553f4e64a5b3d255e487c2dfade6207396f16afe42b87806545d14508d4fddeb96eec5bc3ffb368d451f64b5c90bbeb0285503137bae516
+DIST lager-3.2.1.tar.gz 244701 SHA256 5ef0f65e0c18a7df5c5f2cd8e96780396f13369127d87857e7931670c79a9327 SHA512 2b9f82224943fd196f8aa12f228618996c3dcb2e83c8bf2633375e38771a4817e791db1d54493ab02835382796444266b623fce5686c864e21e49affddabea32 WHIRLPOOL ac172e6574c6eb36d12cbb15b5304a4966a34c6892e4e0ace5cfe84dcdbcd0e18c43bfe3fdeccba967b7b69222ff28b6858e5eb419b131071c484dbdb3575ce4
diff --git a/dev-erlang/lager/lager-3.2.0.ebuild b/dev-erlang/lager/lager-3.2.0.ebuild
index f29930a7978c..4d83f9a97ba6 100644
--- a/dev-erlang/lager/lager-3.2.0.ebuild
+++ b/dev-erlang/lager/lager-3.2.0.ebuild
@@ -31,5 +31,5 @@ PATCHES=(
 src_prepare() {
 	rebar_src_prepare
 	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv"
+	rm -r "${S}/priv" || die
 }
diff --git a/dev-erlang/lager/lager-3.2.1.ebuild b/dev-erlang/lager/lager-3.2.1.ebuild
new file mode 100644
index 000000000000..125310bc9b32
--- /dev/null
+++ b/dev-erlang/lager/lager-3.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Logging framework for Erlang/OTP"
+HOMEPAGE="https://github.com/basho/lager"
+SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/goldrush-0.1.8
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md TODO )
+
+src_prepare() {
+	rebar_src_prepare
+	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
+	rm -r "${S}/priv" || die
+}
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 822621005f3f..a5cffbca5b2a 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -1 +1,2 @@
 DIST p1_utils-1.0.4.tar.gz 44082 SHA256 3fb5157f1c1cc22c992b2b6541a95cedafbc1a2a5f6ae7abca3707150ff557f5 SHA512 a86da4d5201ea9fa16574e4351f5f4ba32eb36fb61feb20231e4ee7c9bfe03a12724b6b50777adc65319055c29b8a3313c9fe72263089ad8a4c8b7ba9f30a3b8 WHIRLPOOL 1f989a9e0fdae2f0b0528df83b0c82317532436fd38c25317e771e213d2951a77206d279d841457ee07d6149eab50af0f84baea94d720fb155d432d14982fc1d
+DIST p1_utils-1.0.5.tar.gz 44167 SHA256 ef1009ea2fd3ffbe46747dd911e2b790621991b07ebbbe66d81893f9f5f8f7ee SHA512 40d030e00eb5d9623035200c0a3650d2e0bc34c2cee3e46f8084c04643649fcaf33d265395d5d7414357e7e052a7be8929d3720e2c7a13a20a1379426fb5a5f2 WHIRLPOOL 628d057f635d4ca30d952c460861fba2f781a9dcee7bb5ce62e60c29668159a051d5a973751f72f66e5c8726d3ff80cfd339125650d3dc8b4a5d7f83f8ae23f8
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.5.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.5.ebuild
new file mode 100644
index 000000000000..5a2e563409ba
--- /dev/null
+++ b/dev-erlang/p1_utils/p1_utils-1.0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/proper/Manifest b/dev-erlang/proper/Manifest
index 12c534063cf3..efcd7d62305b 100644
--- a/dev-erlang/proper/Manifest
+++ b/dev-erlang/proper/Manifest
@@ -1 +1,2 @@
 DIST proper-1.1_p20160426.tar.bz2 268512 SHA256 35a9eba20bd22f9f6231c660d34d07a7bb8532d7fb90e1493d3cd2a9186603d1 SHA512 da9d5bfec99df620d1813a4690235b3862eaaca2c360303dabb27a6cf828046e46ee2adbb1941b2b5330621e30808fb269995e0b1dec0d29cf96f07f32fd1da7 WHIRLPOOL 5dd22bdaefce6ee32e9a4cf9b04c71a0373c88b5311f9d97bbd69db7c910420f83a843cf304040c04dbd233a248abbbf8c62d386065c9805c8bdcf0a6c2c81f7
+DIST proper-1.2.tar.gz 291892 SHA256 ec5e1087652640dfc33db82e53130b73e4ad9193dafc8662cda0fccf8a7a7f0e SHA512 07030eaf63d7e28d5df168ab6b49bf1ad1850b962453079f8421ce4b682caa0e6bf166a71e7abebff3d61c3ada7da86fe3b6ffee3a8ddadb9686e75733cbf75e WHIRLPOOL 8f8054d1e0768ae8ac7f03a41dabbe0237705d261f47de23ea6bdaaf775131d55ad34fae210d10c9e56868a4eab971db0cda8ef8d961cc82ed032922088bbefc
diff --git a/dev-erlang/proper/proper-1.2.ebuild b/dev-erlang/proper/proper-1.2.ebuild
new file mode 100644
index 000000000000..8e54ab08af91
--- /dev/null
+++ b/dev-erlang/proper/proper-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="QuickCheck-inspired property-based testing tool for Erlang"
+HOMEPAGE="https://github.com/manopapad/proper"
+SRC_URI="https://github.com/manopapad/proper/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md THANKS )
+
+src_configure() {
+	./configure
+}
diff --git a/dev-erlang/protobuffs/Manifest b/dev-erlang/protobuffs/Manifest
index 7375676d945e..f39528cc694e 100644
--- a/dev-erlang/protobuffs/Manifest
+++ b/dev-erlang/protobuffs/Manifest
@@ -1 +1,2 @@
 DIST protobuffs-0.8.2.tar.gz 132660 SHA256 82e196d6d9b95e2df1f420f2d39ca54f6eba92e65ca5aa6119f8310822e6b4d3 SHA512 56e9f8d41c500769724adadf025e3915e2b1ab6b68f1664080a49e783facf3d79b5ec20eb8664db9babeea21fc0637c88b1e4a121ca810247e32831a79171b11 WHIRLPOOL 368524db4587446e75d71b340c2369775c6b9ee5742aef60ee1da41a506c9b72ce4f9ff2fc3ad17d399f4d959415ca013562b6d12da9f68a9ac38516a8a34805
+DIST protobuffs-0.9.0.tar.gz 237560 SHA256 0194ad3ce489f9b76fd6566763819d7ee2036e1e031c45347c16086478d5a1c1 SHA512 f5838723c5e5ae55f412848978729347186075917893e0b74e5af966ced9f12e8bc65906f3e591c78a99e64d70461df46e5719b83c262e9bbc5acfd1e50ae1d2 WHIRLPOOL 86185332a736e69a9667e8aa732a6a4631bb411c7d66f0a6d7b319c265add8ae55d76662d3eadae87c45bce5f280c89460da391a639cb15671027f80cd2c4e79
diff --git a/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild b/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild
new file mode 100644
index 000000000000..8ae511da4257
--- /dev/null
+++ b/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+MY_PN="erlang_protobuffs"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Google's Protocol Buffers for Erlang"
+HOMEPAGE="https://github.com/basho/erlang_protobuffs"
+SRC_URI="https://github.com/basho/${MY_PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-lang/erlang-17.1"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-erlang/meck-0.8.2
+		>=dev-erlang/proper-1.1
+	)"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS  ChangeLog  README.md RELNOTES.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	./scripts/generate_emakefile.escript || die
+	erebar ct
+	# FIXME: 1 test fails, reported upstream:
+	# FIXME: https://github.com/basho/erlang_protobuffs/issues/100
+	# FIXME: erebar eunit
+}
diff --git a/dev-erlang/riak_pb/Manifest b/dev-erlang/riak_pb/Manifest
index 5ee06c5dbba7..d60e6bfb855d 100644
--- a/dev-erlang/riak_pb/Manifest
+++ b/dev-erlang/riak_pb/Manifest
@@ -1 +1,2 @@
 DIST riak_pb-2.1.0.7.tar.gz 224466 SHA256 a93c5ca952ec81e52d705dc280c3190a4a4f73419a40c4e6cc27c586d1d40dc1 SHA512 671b164e1eeaf99ccf726f834bc7e819c5cb232361348b45480411f49c1b0a59158abde016b2fdff47240f275bb594ce70f1deeed0c0b2067e79721f6eb13048 WHIRLPOOL 15731399df238fc137356a03523949797413177f18a1d2244bf2e9cb9e7a2d3bd064b5bb71dc5db60ad22392ceb22ce4ca17a9c323e831647b7850d6258f55bb
+DIST riak_pb-2.1.4.2.tar.gz 235730 SHA256 54064a2115dbcf8daa5265b8d338015ccaa208766b0414af273102c395794b6f SHA512 82d06323fe1e1528319ed95dcff4612a27625df2684519739329e92dcba46864ee23684154f28f312952cc7c341a30b6ad3c72feeab4a9e0ad5101cf9218bd0f WHIRLPOOL c4178901fc569c15f926818bf9db744b0b5db162ee08eeba0b6662036aa0507fc3f72988b17acfe68ec3b617291c1ed86522c89622439d992e0ddd53ac110db9
diff --git a/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild b/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild
new file mode 100644
index 000000000000..8d5e86dd63d7
--- /dev/null
+++ b/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Riak Protocol Buffers messages"
+HOMEPAGE="https://github.com/basho/riak_pb"
+SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/protobuffs-0.9.0
+	>=dev-erlang/hamcrest-0.1.0_p20160709
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md RELNOTES.md )
diff --git a/dev-erlang/riakc/Manifest b/dev-erlang/riakc/Manifest
index bc0e3b55e98d..a2d5bfacc157 100644
--- a/dev-erlang/riakc/Manifest
+++ b/dev-erlang/riakc/Manifest
@@ -1 +1,2 @@
 DIST riakc-2.1.1_p20151111.tar.gz 229778 SHA256 9d3b066e05b0b28d84b03cb87873ed28183056e70e9f64ac703e2a0eb2005719 SHA512 b9dfaf4869ed087cfb093626d1dafc496ecd46f367cffb93768e645e1d8d42d577f13ce9a2516d32efd9e2aa1b0214e4572b77f5498979683fceb5d490f0de43 WHIRLPOOL ac3ae051d53f6a8845b49dbb6f87840cea12abfe1d0e782adfbb8194d8894e1f171124f29f9416e895d33fe04434e7f528c5a6c1dea88e7dea3b7c6cb1def774
+DIST riakc-2.4.1.tar.gz 271545 SHA256 d2226db72ded3e830496b86c498fa8e120a2322631d6389eec3fa58ef3f83e0e SHA512 ee33dcf87db0587e81411794d8916d1d5b0c9f7603a814bc44f5916e4c32342395420b695c966311985ed771d4894210c3e5e8fe9cc86bfe20ccc61e1b2751ca WHIRLPOOL 7f3ac4cccaea0873deb0ebea39f5ce0d6beec5942f7f6e2c6b36000125037ca87ebe938ea055b68273907349771074c97bb0d79af95e1bcf9e069b7d8aeddd87
diff --git a/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild b/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild
index 64c0edb08a0a..7cb80b77ad7f 100644
--- a/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild
+++ b/dev-erlang/riakc/riakc-2.1.1_p20151111.ebuild
@@ -24,5 +24,5 @@ DOCS=( README.md )
 src_prepare() {
 	rebar_src_prepare
 	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv"
+	rm -r "${S}/priv" || die
 }
diff --git a/dev-erlang/riakc/riakc-2.4.1.ebuild b/dev-erlang/riakc/riakc-2.4.1.ebuild
new file mode 100644
index 000000000000..0ee77e4cb167
--- /dev/null
+++ b/dev-erlang/riakc/riakc-2.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+MY_PN="riak-erlang-client"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Erlang clients for Riak"
+HOMEPAGE="https://github.com/basho/riak-erlang-client"
+SRC_URI="https://github.com/basho/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/riak_pb-2.1.4.1
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md RELNOTES.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rebar_src_prepare
+	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
+	rm -r "${S}/priv" || die
+}
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 8c6f122c743e..53055c2bbf67 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1 +1,2 @@
 DIST stringprep-1.0.3.tar.gz 95189 SHA256 ec6c99adb3b9551993b6a6166a17af3d34f1ca5bd1cd16e728876764a1eab9f5 SHA512 a42ad55ddfe69f34025fb4ce8f357b13ca3f24449da7ca1e4dc5d78dd350d39530c39d1f3542fe0cba8081c6bc5d3441a606f227733d7a6d87d658a703a0feb1 WHIRLPOOL 890664f795b31d76f460e095750e0f3bec318fbc8db97910a83c95f05f6bc63ada7bab497ddb3231eccf60645a33cbea875bc20382baf40b1974e40ae6630c1d
+DIST stringprep-1.0.5.tar.gz 95323 SHA256 ff5113f1cc77580ada72c97f89cbb91a9026d683a7734adf67e95a8831d3903b SHA512 08132b1c6ceb7e4d069677e8a49ef2543b7d2491d745b3b68cc59b1786ad9884db5e694317ea44059c285ce63df4e7ababc6e0fbad2f36105479e6a07e159a05 WHIRLPOOL e5479b87617b779b53090e443f70f784d96a8f91bd6a0f74d4f565024d3b6981f11ee6d9c24a90ba0959ad6ccbe39500ba1cbdce59840e2cf7d353d94ec2d378
diff --git a/dev-erlang/stringprep/stringprep-1.0.5.ebuild b/dev-erlang/stringprep/stringprep-1.0.5.ebuild
new file mode 100644
index 000000000000..bab9558b8bb8
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.4
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index f8e8d26647f8..007e9d06dcda 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1 +1,2 @@
 DIST stun-1.0.3.tar.gz 28646 SHA256 aae567e4322c8bce604b50cdd41e7634d6047300ef67308199d81aff77d9992f SHA512 c15918f4b1f81477a7834dc5ba837fcd512249bda569cf3ffd3066056e6f1abacfeab3d0dde575402291d841f257a3b33e27d6c76250ae353d77e3fdd87f9786 WHIRLPOOL 9028eed54f0ae62e8ecfb760ae1a94ea834fd397ab35e4332ea2d1b158271809414e21bed60ff9c936e9637e60d107b49a0f30032f3fc40ee97421e20012bb1e
+DIST stun-1.0.6.tar.gz 28681 SHA256 21a25d0ec6292c13bc77e3225bd3f0b2b26d70f815c6e8904c825028629e70cd SHA512 30a34a660d246ed33015e2f4b890203a2648553ed6e2dced87e30bca2eb9d09486684947332f7239d535ce19a36028a0642136e5b574f3c5b867f598341bcaf9 WHIRLPOOL f27e281f21156859533d39524537e8327a58523e38e0114a00af1e6f16769fc6875b0547421cd65c190e812716105842880bd6ad435b297077d2c58be725ddb6
diff --git a/dev-erlang/stun/stun-1.0.6.ebuild b/dev-erlang/stun/stun-1.0.6.ebuild
new file mode 100644
index 000000000000..07b9f60f72cd
--- /dev/null
+++ b/dev-erlang/stun/stun-1.0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.0.6
+	>=dev-erlang/p1_utils-1.0.4
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 2ddd5afe1486..cfe019b0f8f3 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1 +1,2 @@
 DIST irrlicht-1.8.1.zip 24167632 SHA256 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb WHIRLPOOL c66f0a15575327667cbe82c79919518771e55d5e919c972e64e104a6272b78a20bbb7bbba864722dead4248fb43dd722227181d696eb63e82b4093aaadac132b
+DIST irrlicht-1.8.4.zip 27927144 SHA256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 WHIRLPOOL a5fecbd27968fbd4a5b17b9528388ec0870d1c3ceb85e36bbab40ce30aa61c7f2f387df160808dbaafa4488abeaf238c7cf93994b380a1b2c3a8a5c421949be1
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
new file mode 100644
index 000000000000..0c51ffe884b9
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
@@ -0,0 +1,29 @@
+--- irrlicht-1.8.4/include/IrrCompileConfig.h
++++ irrlicht-1.8.4/include/IrrCompileConfig.h
+@@ -245,7 +245,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif
+@@ -261,7 +261,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #endif
+@@ -598,7 +598,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
++//#define _IRR_USE_NON_SYSTEM_ZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+ #endif
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
new file mode 100644
index 000000000000..e46841d8f43b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
@@ -0,0 +1,764 @@
+--- irrlicht-1.8.4/examples/Demo/Makefile
++++ irrlicht-1.8.4/examples/Demo/Makefile
+@@ -2,8 +2,9 @@

+ Target = Demo

+ Sources = CDemo.cpp CMainMenu.cpp main.cpp

+ 

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -Wall -O3 -ffast-math

++CXXFLAGS ?= -O3

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS += -Wall -ffast-math

+ 

+ ifeq ($(HOSTTYPE), x86_64)

+ LIBSELECT=64

+@@ -13,7 +14,7 @@

+ 

+ # target specific settings

+ all_linux: SYSTEM=Linux

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ 

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm

+--- irrlicht-1.8.4/examples/14.Win32Window/Makefile
++++ irrlicht-1.8.4/examples/14.Win32Window/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
++++ irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht 

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
++++ irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/08.SpecialFX/Makefile
++++ irrlicht-1.8.4/examples/08.SpecialFX/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/06.2DGraphics/Makefile
++++ irrlicht-1.8.4/examples/06.2DGraphics/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/04.Movement/Makefile
++++ irrlicht-1.8.4/examples/04.Movement/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,14 +18,14 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
++++ irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
++++ irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/02.Quake3Map/Makefile
++++ irrlicht-1.8.4/examples/02.Quake3Map/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,7 +18,7 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht

+ static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm

+@@ -25,7 +25,7 @@

+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc

+ static_win32 all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32 static_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
++++ irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
+@@ -5,9 +5,10 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS += -I/usr/include/irrlicht

+ #CXXFLAGS = -O3 -ffast-math

+-CXXFLAGS = -g -Wall

++CXXFLAGS ?= -O3

++CXXFLAGS += -Wall

+ 

+ #default target is Linux

+ all: all_linux

+@@ -17,14 +18,14 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
++++ irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/10.Shaders/Makefile
++++ irrlicht-1.8.4/examples/10.Shaders/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/09.Meshviewer/Makefile
++++ irrlicht-1.8.4/examples/09.Meshviewer/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS +=  -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
++++ irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
+@@ -5,9 +5,10 @@

+ Sources = main.cpp sound.cpp q3factory.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS += -I/usr/include/irrlicht

+ #CXXFLAGS = -O3 -ffast-math

++CXXFLAGS ?= -O3

+-CXXFLAGS = -g -Wall

++CXXFLAGS += -Wall

+ 

+ #default target is Linux

+ all: all_linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
++++ irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/20.ManagedLights/Makefile
++++ irrlicht-1.8.4/examples/20.ManagedLights/Makefile
+@@ -5,9 +5,10 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS += -I/usr/include/irrlicht

+ #CXXFLAGS = -O3 -ffast-math

++CXXFLAGS ?= -O3

+-CXXFLAGS = -g -Wall

++CXXFLAGS += -Wall

+ 

+ #default target is Linux

+ all: all_linux

+@@ -17,14 +18,14 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/05.UserInterface/Makefile
++++ irrlicht-1.8.4/examples/05.UserInterface/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/01.HelloWorld/Makefile
++++ irrlicht-1.8.4/examples/01.HelloWorld/Makefile
+@@ -7,15 +7,15 @@

+ # List of source files, separated by spaces

+ Sources := main.cpp

+ # Path to Irrlicht directory, should contain include/ and lib/

+-IrrlichtHome := ../..

++IrrlichtHome := /usr

+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems

+-BinPath = ../../bin/$(SYSTEM)

++BinPath = ../../bin

+ 

+ # general compiler settings (might need to be set when compiling the lib, too)

+ # preprocessor flags, e.g. defines and include paths

+ USERCPPFLAGS = 

+ # compiler flags such as optimization flags

+-USERCXXFLAGS = -O3 -ffast-math

++USERCXXFLAGS = -ffast-math

+ #USERCXXFLAGS = -g -Wall

+ # linker flags such as additional libraries and link paths

+ USERLDFLAGS =

+@@ -24,16 +24,17 @@

+ #no changes necessary below this line

+ ####

+ 

+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)

+-CXXFLAGS = $(USERCXXFLAGS)

+-LDFLAGS = $(USERLDFLAGS)

++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)

++CXXFLAGS ?= -O3

++CXXFLAGS += $(USERCXXFLAGS)

++LDFLAGS += $(USERLDFLAGS)

+ 

+ #default target is Linux

+ all: all_linux

+ 

+ # target specific settings

+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht

+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht

++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32 static_win32: SUF=.exe

+--- irrlicht-1.8.4/examples/18.SplitScreen/Makefile
++++ irrlicht-1.8.4/examples/18.SplitScreen/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/07.Collision/Makefile
++++ irrlicht-1.8.4/examples/07.Collision/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,13 +18,13 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- irrlicht-1.8.4/examples/24.CursorControl/Makefile
++++ irrlicht-1.8.4/examples/24.CursorControl/Makefile
+@@ -7,15 +7,15 @@

+ # List of source files, separated by spaces

+ Sources := main.cpp

+ # Path to Irrlicht directory, should contain include/ and lib/

+-IrrlichtHome := ../..

++IrrlichtHome := /usr

+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems

+-BinPath = ../../bin/$(SYSTEM)

++BinPath = ../../bin

+ 

+ # general compiler settings (might need to be set when compiling the lib, too)

+ # preprocessor flags, e.g. defines and include paths

+ USERCPPFLAGS = 

+ # compiler flags such as optimization flags

+-USERCXXFLAGS = -O3 -ffast-math

++USERCXXFLAGS = -ffast-math

+ #USERCXXFLAGS = -g -Wall

+ # linker flags such as additional libraries and link paths

+ USERLDFLAGS =

+@@ -24,16 +24,17 @@

+ #no changes necessary below this line

+ ####

+ 

+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)

+-CXXFLAGS = $(USERCXXFLAGS)

+-LDFLAGS = $(USERLDFLAGS)

++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)

++CXXFLAGS ?= -O3

++CXXFLAGS += $(USERCXXFLAGS)

++LDFLAGS += $(USERLDFLAGS)

+ 

+ #default target is Linux

+ all: all_linux

+ 

+ # target specific settings

+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht

+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht

++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32 static_win32: SUF=.exe

+--- irrlicht-1.8.4/examples/25.XmlHandling/Makefile
++++ irrlicht-1.8.4/examples/25.XmlHandling/Makefile
+@@ -7,15 +7,15 @@

+ # List of source files, separated by spaces

+ Sources := main.cpp

+ # Path to Irrlicht directory, should contain include/ and lib/

+-IrrlichtHome := ../..

++IrrlichtHome := /usr

+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems

+-BinPath = ../../bin/$(SYSTEM)

++BinPath = ../../bin

+ 

+ # general compiler settings (might need to be set when compiling the lib, too)

+ # preprocessor flags, e.g. defines and include paths

+ USERCPPFLAGS = 

+ # compiler flags such as optimization flags

+-USERCXXFLAGS = -O3 -ffast-math

++USERCXXFLAGS = -ffast-math

+ #USERCXXFLAGS = -g -Wall

+ # linker flags such as additional libraries and link paths

+ USERLDFLAGS =

+@@ -24,16 +24,17 @@

+ #no changes necessary below this line

+ ####

+ 

+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)

+-CXXFLAGS = $(USERCXXFLAGS)

+-LDFLAGS = $(USERLDFLAGS)

++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)

++CXXFLAGS ?= -O3

++CXXFLAGS += $(USERCXXFLAGS)

++LDFLAGS += $(USERLDFLAGS)

+ 

+ #default target is Linux

+ all: all_linux

+ 

+ # target specific settings

+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht

+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht

++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32 static_win32: SUF=.exe

+--- irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
++++ irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
+@@ -5,8 +5,9 @@

+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

+-CXXFLAGS = -O3 -ffast-math

++CPPFLAGS += -I/usr/include/irrlicht

++CXXFLAGS ?= -O3

++CXXFLAGS += -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+ #default target is Linux

+@@ -17,14 +18,14 @@

+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor

++all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)

+ 

+ all_linux all_win32:

+ 	$(warning Building...)

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
new file mode 100644
index 000000000000..d40a7da18743
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
@@ -0,0 +1,46 @@
+--- irrlicht-1.8.4/source/Irrlicht/Makefile
++++ irrlicht-1.8.4/source/Irrlicht/Makefile
+@@ -46,11 +46,7 @@
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o

+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o

+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o

+-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o

+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o

+-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o

+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o

+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o

+ 

+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions

+ EXTRAOBJ =

+@@ -61,18 +57,16 @@
+ 

+ ###############

+ #Compiler flags

+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng

++CXXINCS = -I../../include

+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1

+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing

++CXXFLAGS += -Wall -fno-exceptions -fno-rtti

+ ifndef NDEBUG

+-CXXFLAGS += -g -D_DEBUG

+-else

+-CXXFLAGS += -fexpensive-optimizations -O3

++CXXFLAGS += -D_DEBUG

+ endif

+ ifdef PROFILE

+ CXXFLAGS += -pg

+ endif

+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

+ 

+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC

+ sharedlib sharedlib_osx: CFLAGS += -fPIC

+@@ -88,7 +82,7 @@
+ LIB_PATH = ../../lib/$(SYSTEM)

+ INSTALL_DIR = /usr/local/lib

+ sharedlib install: SHARED_LIB = libIrrlicht.so

+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm

++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz

+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include

+ 

+ #OSX specific options

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
new file mode 100644
index 000000000000..2c6f7ddeb93d
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/show_bug.cgi?id=520746
+
+http://code.metager.de/source/diff/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp?r2=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404823&r1=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404320
+
+--- irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
++++ irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
+@@ -66,7 +66,7 @@
+ boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
+ {
+ 	// DO NOTHING
+-	return 1;
++	return TRUE;
+ }
+ 
+ 
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
new file mode 100644
index 000000000000..145d543b8ad0
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
@@ -0,0 +1,40 @@
+From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
+From: hiker <henrichsjoerg@mgail.com>
+Date: Wed, 26 Feb 2014 11:13:03 +1100
+Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
+ problems.
+
+--- irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
++++ irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,6 +21,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 		#include "glext.h"
+ 	#endif
+ 	#include "wglext.h"
+@@ -35,6 +36,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++		typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 		#include "glext.h"
+ 	#endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+@@ -48,6 +50,7 @@
+ 	#define NO_SDL_GLEXT
+ 	#include <SDL/SDL_video.h>
+ 	#include <SDL/SDL_opengl.h>
++	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 	#include "glext.h"
+ #else
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -60,6 +63,7 @@
+ 	#include <GL/gl.h>
+ 	#include <GL/glx.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
++	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+ 	#include "glext.h"
+ 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
+ 	#include "glxext.h"
diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
new file mode 100644
index 000000000000..fa018e3d6bfc
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="open source high performance realtime 3D engine written in C++"
+HOMEPAGE="http://irrlicht.sourceforge.net/"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc static-libs"
+
+RDEPEND="virtual/jpeg:0
+	media-libs/libpng:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/${PN^}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-demoMake.patch
+	"${FILESDIR}"/${P}-mesa-10.x.patch
+	"${FILESDIR}"/${P}-jpeg-9a.patch )
+
+DOCS=( changes.txt readme.txt )
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	edos2unix include/IrrCompileConfig.h
+	sed -i \
+		-e 's:\.\./\.\./media:../media:g' \
+		$(grep -rl '\.\./\.\./media' examples) \
+		|| die 'sed failed'
+	default
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "")
+}
+
+src_install() {
+	cd "${WORKDIR}"/${P} || die
+
+	use static-libs && dolib.a lib/Linux/libIrrlicht.a
+	dolib.so lib/Linux/libIrrlicht.so*
+
+	# create library symlinks
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so
+
+	insinto /usr/include/${PN}
+	doins include/*
+
+	einstalldocs
+
+	# don't do these with einstalldocs because they shouldn't be compressed
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples media
+	fi
+}
diff --git a/dev-haskell/ac-ppm/Manifest b/dev-haskell/ac-ppm/Manifest
new file mode 100644
index 000000000000..92d077ed1738
--- /dev/null
+++ b/dev-haskell/ac-ppm/Manifest
@@ -0,0 +1 @@
+DIST AC-PPM-1.1.1.tar.gz 2958 SHA256 783e93443321e5a1a1fcb63ee266bd21b9f2daf0b2bed8e6cfa0746a1dff5c78 SHA512 c296cb02fa9d70ca1f75bfdda8e307f66c800ac0e7b110bdd4af685c6acc506f3310456519d2445f850263baa22aa317266c68166bfcb551d297296d8c4de5ef WHIRLPOOL 182331ab2e10fd4b5a812d8decd1c9ae03af68a6bbadfdac951b15156e0b09a04f213813d47a805197149386090b2d8113e8a17ba8578bec44f6170dcd8cc2c6
diff --git a/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild b/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
new file mode 100644
index 000000000000..41bcfcec77a9
--- /dev/null
+++ b/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="AC-PPM"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Trivial package for writing PPM images"
+HOMEPAGE="http://hackage.haskell.org/package/AC-PPM"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/ac-ppm/metadata.xml b/dev-haskell/ac-ppm/metadata.xml
new file mode 100644
index 000000000000..435999615a27
--- /dev/null
+++ b/dev-haskell/ac-ppm/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package is written in 100% Haskell and enables you to
+		write PPM (\&quot;Portable Pixel Map\&quot;) images in human-readable
+		text format as well as the more efficient binary format.
+		It uses the ByteString library for maximum efficiency.
+		For those that don&#39;t know, PPM is an image file format
+		which is trivially simple, but therefore horribly inefficient.
+		None the less, many programs can read PPM files, so this
+		package represents an easy way to write Haskell code that
+		generates images, without having to depend on any external
+		C code.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/argparser/Manifest b/dev-haskell/argparser/Manifest
new file mode 100644
index 000000000000..85123132763d
--- /dev/null
+++ b/dev-haskell/argparser/Manifest
@@ -0,0 +1 @@
+DIST argparser-0.3.4.tar.gz 14562 SHA256 e645c7a587d1a82f4e550fc5ac22c4c615c1c59429f2cff52dd393ca2a91ed7a SHA512 c7aa03426e42df57ea02ad86d044624ce8e7c0e5b3ce124434fa64a172c8dbf70001e1353b9d3bb15ad780535adc8c0426939d1b26e52a7c51b17987fc72d7d7 WHIRLPOOL 10dc13bd4cee4feb44e6d6a75230de7fb51d44a1c2e2ae508213cf0a199b64d4708ce012eb4b958c85cdb3603bee47aff2b2928242136e2e09aa38b49303e4e1
diff --git a/dev-haskell/argparser/argparser-0.3.4.ebuild b/dev-haskell/argparser/argparser-0.3.4.ebuild
new file mode 100644
index 000000000000..53b3bc64043d
--- /dev/null
+++ b/dev-haskell/argparser/argparser-0.3.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Command line parsing framework for console applications"
+HOMEPAGE="http://hackage.haskell.org/package/argparser"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # missing files
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >dev-haskell/htf-0.9
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/argparser/metadata.xml b/dev-haskell/argparser/metadata.xml
new file mode 100644
index 000000000000..4723062c2054
--- /dev/null
+++ b/dev-haskell/argparser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Provides a combinator library for defining a command line parser.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/arithmoi/Manifest b/dev-haskell/arithmoi/Manifest
index 8f8f9bd82336..0b180367018f 100644
--- a/dev-haskell/arithmoi/Manifest
+++ b/dev-haskell/arithmoi/Manifest
@@ -1 +1,2 @@
 DIST arithmoi-0.4.1.3.tar.gz 66196 SHA256 2e623924079d3f8733fd31bf40a30ee0051dd0c3e3ae4b13a7afb5f2300413c9 SHA512 abc5939207e502dffd91b3a4e2b9c688eef388a6b9354576fcb4badf4625da1cad0e9698cb42b293b37cc29427ad2679170452374fbf6cd5e614d53db34cd9f6 WHIRLPOOL dc0c167e63430d8f57fef7107f8444fa2fb1e76a5664043524df6c606f778cbecb457c43d9b1484015b96d4f91c221e60718f637593362ad657e7c5a5ae24a48
+DIST arithmoi-0.4.2.0.tar.gz 84676 SHA256 6cc6ade285cdbd437c3e5587e588d4d55152a273e9c276a4679cc22a6e1d2a88 SHA512 687f12aef8baf98c778498b9a0bb33f0ac3175d009ba8dcd14d6ff8bb13252120f6821e80932410a1413637b591f81b92e0ecd25cd7870464e1629f3d0bf866c WHIRLPOOL 4b852e9349371512901fb5f5f15a11e871e809e56620e71dce9e68969e23ee6978f5c24733d7373a4debd4df75ffc96bbdecff3056b490ee55a6b737a70fe58f
diff --git a/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild b/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild
new file mode 100644
index 000000000000..f5251dfffaae
--- /dev/null
+++ b/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: -check-bounds
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
+HOMEPAGE="https://github.com/cartazio/arithmoi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2
+		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
+		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-check-bounds
+}
diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest
index 29d400a52453..eca801996f65 100644
--- a/dev-haskell/base-orphans/Manifest
+++ b/dev-haskell/base-orphans/Manifest
@@ -1 +1,2 @@
 DIST base-orphans-0.3.2.tar.gz 12608 SHA256 f41a88952ae2b20acdaed44da2b9f1860f93703eb78e8ff9926d0a0a598776e1 SHA512 2c62148c49e123a8e6f95ac65c4b8998c73f3f0d0bfc71e90058f3d75d760b048f8b3f8a0e88ac80c39947ce3d3d42243b66a2370045e44cbacb1f054335303c WHIRLPOOL b3331899085e11a11be9a3bb4f025b35648c03edeea6a861a67bca880eb5e65a1f3fd28ebe32bd7415397b98867a33d89d89c72c5aaf1b7b9e51418e4d498a64
+DIST base-orphans-0.5.4.tar.gz 16834 SHA256 04075283606b3633f4b0c72f849a6df1b0519421ad099d07d3e72de589056263 SHA512 41338450e2669936ff8bedbd59954b988154f286e9beb37f4ab98983070b5a99bc3340e3b56fe2701c2a7cc3eed0d8dd549241f1b19c252ea4db8600dd5b5fab WHIRLPOOL 63c3faec304a44db8a8d8b1c67680a392535471c36ff88818ef4792cb98693fe00dc21b22a18e36c3d2b7658516c86514c76486f2c1b597db619785b0fbb5973
diff --git a/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild b/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
new file mode 100644
index 000000000000..9b7bc80b99f3
--- /dev/null
+++ b/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backwards-compatible orphan instances for base"
+HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/bitwise/Manifest b/dev-haskell/bitwise/Manifest
new file mode 100644
index 000000000000..2ce8f28880a0
--- /dev/null
+++ b/dev-haskell/bitwise/Manifest
@@ -0,0 +1 @@
+DIST bitwise-0.1.1.1.tar.gz 17107 SHA256 cde04615108c8e1e4b9f3a6fd7115b6fe40068385489fc5fc3d41e3700d69486 SHA512 f599411c6ce68a0ac71045ade891ae9c70a2b94b79285cdbac9e694bf227df5f0e65f115321ac62ac2878232aa91b5a6a376ae43654671fda0de2f9b0b65c70e WHIRLPOOL 6e161561d8a34400b93763b699a7af5fa8a7f5a10d097a2ae6cd6365f12d8e12c253fc316b11e63b0ff4b6c6fffdca0f2d399439c4babe0af3e97f56563c3d91
diff --git a/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild b/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild
new file mode 100644
index 000000000000..4cee11ce3c00
--- /dev/null
+++ b/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="fast multi-dimensional unboxed bit packed Bool arrays"
+HOMEPAGE="http://code.mathr.co.uk/bitwise"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( >=dev-haskell/quickcheck-2.4 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'QuickCheck >= 2.4 && < 2.9' 'QuickCheck >= 2.4'
+}
diff --git a/dev-haskell/bitwise/metadata.xml b/dev-haskell/bitwise/metadata.xml
new file mode 100644
index 000000000000..4f0bc14cf689
--- /dev/null
+++ b/dev-haskell/bitwise/metadata.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Unboxed multidimensional bit packed Bool arrays with fast aggregate
+		operations based on lifting Bool operations to bitwise operations.
+		
+		There are many other bit packed structures out there, but none met
+		all of these requirements:
+		
+		(1) unboxed bit packed Bool array,
+		
+		(2) multi-dimensional indexing,
+		
+		(3) fast (de)serialization, or interoperable with foreign code,
+		
+		(4) fast aggregate operations (fold, map, zip).
+		
+		Quick tour of the bitwise library:
+		
+		[Data.Bits.Bitwise] Lift boolean operations on &#39;Bool&#39; to bitwise
+		operations on &#39;Data.Bits.Bits&#39;.
+		
+		[Data.Array.BitArray] Immutable bit arrays.
+		
+		[Data.Array.BitArray.ST] Mutable bit arrays in &#39;Control.Monad.ST.ST&#39;.
+		
+		[Data.Array.BitArray.IO] Mutable bit arrays in &#39;IO&#39;.
+		
+		[Data.Array.BitArray.ByteString] (De)serialization.
+		
+		[Codec.Image.PBM] Portable bitmap monochrome 2D image format.
+		
+		Very rough performance benchmarks:
+		
+		* immutable random access single bit reads:
+		@BitArray ix@ is about 40% slower than @UArray ix Bool@,
+		
+		* &#39;Control.Monad.ST.ST&#39; mutable random access single bit reads:
+		@STBitArray s ix@ is about the same as @STUArray s ix Bool@,
+		
+		* immutable map @Bool -&gt; Bool@:
+		@BitArray ix@ is about 85x faster than @UArray ix Bool@,
+		
+		* immutable zipWith @Bool -&gt; Bool -&gt; Bool@:
+		@BitArray ix@ is about 1300x faster than @UArray ix Bool@.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/boolean/Manifest b/dev-haskell/boolean/Manifest
new file mode 100644
index 000000000000..33bc5d15e045
--- /dev/null
+++ b/dev-haskell/boolean/Manifest
@@ -0,0 +1 @@
+DIST Boolean-0.2.3.tar.gz 6608 SHA256 f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3 SHA512 803af486e750ba52bc85f8d8599f6a1b36d3d91f2413ac9a7b038d1f091f9a4cee128b24a4de308430b291eb8be781eb100f495106b78f37697a845f8793ad98 WHIRLPOOL 513577f89d7d24ab88a27141056b9a60e87e9be8580d41146b6725610f370bdb203a7694ff73e049c364114a18065af9c4e45f5a13720559298ab7de4b791639
diff --git a/dev-haskell/boolean/boolean-0.2.3.ebuild b/dev-haskell/boolean/boolean-0.2.3.ebuild
new file mode 100644
index 000000000000..87d9561f8699
--- /dev/null
+++ b/dev-haskell/boolean/boolean-0.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="Boolean"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Generalized booleans and numbers"
+HOMEPAGE="http://hackage.haskell.org/package/Boolean"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boolean/metadata.xml b/dev-haskell/boolean/metadata.xml
new file mode 100644
index 000000000000..4f0d65f8f410
--- /dev/null
+++ b/dev-haskell/boolean/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Some classes for generalized boolean operations.
+		
+		Copyright 2009 Conal Elliott; BSD3 license.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/bytes/Manifest b/dev-haskell/bytes/Manifest
new file mode 100644
index 000000000000..f2d5c15b288f
--- /dev/null
+++ b/dev-haskell/bytes/Manifest
@@ -0,0 +1 @@
+DIST bytes-0.15.2.tar.gz 18834 SHA256 0bfaaf70154d3622be1ee620dd75e9c93cf4d4a21544d83f281d01439f261f34 SHA512 339da2fe49a6acd307057bfcc79e7ac09eefb9a93ec60cd52a8d425337e7bf355ca8aa42f304863df773b0ef2c459b53571920611cf1ef8f98e78d112cc6ad29 WHIRLPOOL f9f335dc194f9ee89c11471185dd9ea7da31c4c710dc54dbbfb74212e5deab924e9e0e5f54bf0d4fbc83446974d3a0871ef554f4473523c14d9ae4789c242e36
diff --git a/dev-haskell/bytes/bytes-0.15.2.ebuild b/dev-haskell/bytes/bytes-0.15.2.ebuild
new file mode 100644
index 000000000000..da94ff9872e0
--- /dev/null
+++ b/dev-haskell/bytes/bytes-0.15.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Sharing code for serialization between binary and cereal"
+HOMEPAGE="https://github.com/ekmett/bytes"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+test-doctests"
+
+RDEPEND=">=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
+	>=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-lib-werror \
+		$(cabal_flag test-doctests test-doctests)
+}
diff --git a/dev-haskell/bytes/metadata.xml b/dev-haskell/bytes/metadata.xml
new file mode 100644
index 000000000000..920edccd0ad6
--- /dev/null
+++ b/dev-haskell/bytes/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="test-doctests">Enable the doctest suite when using the enable-tests option for cabal.</flag>
+	</use>
+	<longdescription>
+		Sharing code for serialization between binary and cereal
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/bytestring-handle/Manifest b/dev-haskell/bytestring-handle/Manifest
new file mode 100644
index 000000000000..47d1df991e18
--- /dev/null
+++ b/dev-haskell/bytestring-handle/Manifest
@@ -0,0 +1 @@
+DIST bytestring-handle-0.1.0.4.tar.gz 6204 SHA256 3083c6434a6ec552c6c29030f7b2c44b53dead5f05f4a8363e3c350552ffbe60 SHA512 17649968ffbebf1a567059ecf3f19e8d8f6a1bb53a0b491e35b62d572cff9f949822953452ee72d193546d8779d6d71dfd82ae5cfd2d3b7564ac73df7283facb WHIRLPOOL 34664a33f95abe9b5d3d9b58893999a6e93934953cb07f116a588818bb8d4aab59792deb1b1d4725be5177614316885e35cc84f58c511ceb4be83037ec88cad3
diff --git a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
new file mode 100644
index 000000000000..3c0ace4a7e8f
--- /dev/null
+++ b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ByteString-backed Handles"
+HOMEPAGE="http://hub.darcs.net/ganesh/bytestring-handle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/quickcheck-2.1.2 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/bytestring-handle/metadata.xml b/dev-haskell/bytestring-handle/metadata.xml
new file mode 100644
index 000000000000..1b3ffcef03d2
--- /dev/null
+++ b/dev-haskell/bytestring-handle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		ByteString-backed Handles
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index c32c11eb70d2..426313350fd9 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -3,3 +3,4 @@ DIST cpphs-1.16.tar.gz 71105 SHA256 b7562ee6dd504f210a363c6bb7ea542e67f0a6ad75ac
 DIST cpphs-1.17.1.tar.gz 72200 SHA256 37bd3b78ed9624dc17d7d87c9baac6b62ce3463c15b68cd8323ebea9c77c61f6 SHA512 1db359ba98ed9d6f75c2c35e7bb3f554329b76d7708e9ddf71892b2505d18c7334b30ad3734941d72a832bb7f661f9d346297e8f56980c01564a4f6a4a9cc5dd WHIRLPOOL 3e1eff9a4e4771bbb35e065e6fb8c437a9c758bb064dd4144474337ae35f4b713ccced53eac19f2d0d10c8860d3be812d2a59aeadc86e5eb7a8296c744b2cc65
 DIST cpphs-1.18.8.tar.gz 43861 SHA256 a3a4780f91082e23d3d7b9d0f20dde13d42641891b4c488b63fa97e0e01ebb20 SHA512 ed6041e6e5c358656685d5a62f5e2cf78a8d714feb6844cfcbd6c852543e02410f78e3ed60f23ef52aaccd999a83b27d3d83950724c07c1441e0648ae31a622a WHIRLPOOL 72c03c61bbcf89deeb323e4c4c8973ba928c913611144cec811311219e2978d5d968d2b0ad13c29372c6900820b61b3a04d083ec1a89a744b807ffde1ec935b0
 DIST cpphs-1.19.3.tar.gz 44306 SHA256 e2546aa382e9c22942c5c2849631edc6b1d8cbea2c50762f66b740755faf57da SHA512 30e647b55a7cd86a21ba2346adc2f932c2557e52e59437f523e3300b285c0de51fca43aa29ce9306bc5e3919ed02a51e72056531c33dc52efc1a320ea84746b7 WHIRLPOOL d322b5c94d9042e2d02ac279e0f33cfde6cb1df378922aa78a3ba687c0684f3ce8b950fa0551dfb0c7a204292d418e0a1c78036e4d375794107cb657384bdeeb
+DIST cpphs-1.20.2.tar.gz 44732 SHA256 dcb1d712a0f867c8a4fdd6e4ce7cbd33ce7912c76ac2db3a6157933fad8629db SHA512 0315684ff884f805d281ab2538558d59614e68de47db2e2b02cea05f0b913a20259cff6e2823b88910a3eb1993b25a26e5cc8d3b902b602d14f35bb54c49f5b6 WHIRLPOOL 9b1a991a12f1525148095dd0cc10b6c58f5360045d6ab9842a2df254cc0f323ad3767ce910b747ac4c540a95c4ef35b3b44f33cc47beb76445a4993022753e4c
diff --git a/dev-haskell/cpphs/cpphs-1.20.2.ebuild b/dev-haskell/cpphs/cpphs-1.20.2.ebuild
new file mode 100644
index 000000000000..0750c44d0ed3
--- /dev/null
+++ b/dev-haskell/cpphs/cpphs-1.20.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
+HOMEPAGE="http://projects.haskell.org/cpphs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/polyparse-1.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-accessor/Manifest b/dev-haskell/data-accessor/Manifest
new file mode 100644
index 000000000000..b9ef247cd268
--- /dev/null
+++ b/dev-haskell/data-accessor/Manifest
@@ -0,0 +1 @@
+DIST data-accessor-0.2.2.7.tar.gz 9670 SHA256 3465227ad5f81059a885d354e2f3c108d550287580e6939e18350fa65e78c2ed SHA512 42f78d5be738e83e2bc64a2f38bc70748ecb741433916c4e527355f5e808a844e43b14607cfff149a5951f557c73a947469c878340738244e3778f475ccd021d WHIRLPOOL 5d9cb0eeda4d89b6e5b5e22820431b20faa9736cf539705afdd3bdc9accadec1138ff8acd33d00389755f1b803b79cfd240b13037cafdb27576478084e813ec1
diff --git a/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild b/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild
new file mode 100644
index 000000000000..cf00a3328e54
--- /dev/null
+++ b/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities for accessing and manipulating fields of records"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Record_access"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-accessor/metadata.xml b/dev-haskell/data-accessor/metadata.xml
new file mode 100644
index 000000000000..1962ea1d1e20
--- /dev/null
+++ b/dev-haskell/data-accessor/metadata.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		In Haskell 98 the name of a record field
+		is automatically also the name of a function which gets the value
+		of the according field.
+		E.g. if we have
+		
+		data Pair a b = Pair
+		first :: a, second :: b
+		
+		then
+		
+		&gt; first  :: Pair a b -&gt; a
+		&gt; second :: Pair a b -&gt; b
+		
+		However for setting or modifying a field value
+		we need to use some syntactic sugar, which is often clumsy.
+		
+		modifyFirst :: (a -&gt; a) -&gt; (Pair a b -&gt; Pair a b)
+		modifyFirst f r\@(Pair
+		first=a
+		) = r
+		first = f a
+		
+		With this package you can define record field accessors
+		which allow setting, getting and modifying values easily.
+		The package clearly demonstrates the power of the functional approach:
+		You can combine accessors of a record and sub-records,
+		to make the access look like the fields of the sub-record belong to the main record.
+		
+		Example:
+		
+		&gt; *Data.Accessor.Example&gt; (first^:second^=10) (('b',7),"hallo")
+		&gt; (('b',10),"hallo")
+		
+		You can easily manipulate record fields in a 'Control.Monad.State.State' monad,
+		you can easily code 'Show' instances that use the Accessor syntax
+		and you can parse binary streams into records.
+		See @Data.Accessor.Example@ for demonstration of all features.
+		
+		It would be great if in revised Haskell versions the names of record fields
+		are automatically 'Data.Accessor.Accessor's
+		rather than plain @get@ functions.
+		For now, the package @data-accessor-template@ provides Template Haskell functions
+		for automated generation of 'Data.Acesssor.Accessor's.
+		See also the other @data-accessor@ packages
+		that provide an Accessor interface to other data types.
+		The package @enumset@ provides accessors to bit-packed records.
+		
+		For similar packages see @lenses@ and @fclabel@.
+		A related concept are editors
+		&lt;http://conal.net/blog/posts/semantic-editor-combinators/&gt;.
+		Editors only consist of a modify method
+		(and @modify@ applied to a 'const' function is a @set@ function).
+		This way, they can modify all function values of a function at once,
+		whereas an accessor can only change a single function value,
+		say, it can change @f 0 = 1@ to @f 0 = 2@.
+		This way, editors can even change the type of a record or a function.
+		An Arrow instance can be defined for editors,
+		but for accessors only a Category instance is possible ('(.)' method).
+		The reason is the @arr@ method of the @Arrow@ class,
+		that conflicts with the two-way nature (set and get) of accessors.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/derive/Manifest b/dev-haskell/derive/Manifest
new file mode 100644
index 000000000000..728c36dbb559
--- /dev/null
+++ b/dev-haskell/derive/Manifest
@@ -0,0 +1 @@
+DIST derive-2.5.26.tar.gz 58346 SHA256 b6ef2e5e7fa79d3b76053c97bf88cd2ab77fe15065bf321a135a29d18b4e4a6d SHA512 06297c8d5ebe48dabe3a392a60c1fdec8f81c9a443952c361dfe39d7cf61171162c0e766d26f0f79253ed6540fac756a928543374e0741a334af4ff536e6a6c6 WHIRLPOOL 79181c55e9ac58c9747928f20fe8d53e0ff4d81eb307add78d0c1b4c282058f960e060d3cd7de16c687acc605654df9eb4578ff3b08be11d6d9f7c3fc9087582
diff --git a/dev-haskell/derive/derive-2.5.26.ebuild b/dev-haskell/derive/derive-2.5.26.ebuild
new file mode 100644
index 000000000000..77c055dace59
--- /dev/null
+++ b/dev-haskell/derive/derive-2.5.26.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A program and library to derive instances for data types"
+HOMEPAGE="https://github.com/ndmitchell/derive#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/derive/metadata.xml b/dev-haskell/derive/metadata.xml
new file mode 100644
index 000000000000..bf91602f0990
--- /dev/null
+++ b/dev-haskell/derive/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Data.Derive is a library and a tool for deriving instances for Haskell programs.
+		It is designed to work with custom derivations, SYB and Template Haskell mechanisms.
+		The tool requires GHC, but the generated code is portable to all compilers.
+		We see this tool as a competitor to DrIFT.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index 536d1f0aaf11..cb5685903c0f 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1,2 +1,3 @@
 DIST extra-1.3.1.tar.gz 30439 SHA256 94c8cc02b530e589171d2e0520afac066994a1cb48cd4c847496387489230dfa SHA512 d6e736a021ee39139855516647b91a328e8ff075b94bdcc84c1296586d9f58a20819fcf78a45bd0fc9b3e9516780c68fb27ec0dc406964b6d9d5c93e26bfc9c5 WHIRLPOOL f8d02f3cd149f3d1dd5e30a5411f3359a2e4590061856f8f0350e63b4baafa961ade1ca142696dd1b1db97dc7ec35dc5481e836a4eaaf62803f55cf66b40caac
+DIST extra-1.4.10.tar.gz 34981 SHA256 b40b3f74c02e40697f4ba5242a764c2846921e8aafdd92e79a30a7afd9e56759 SHA512 16b7bbe3944d7013a54dfe629f997bb46a24c9b933a6be9570cd86f6b1bace9c001acb0b5b8d92ddf50aa21ca67d5694d3705029116644012345d20f1e3386fd WHIRLPOOL d7dd9403179259f1778e92c3fdab86474f4aba7584f23f829db32d8fd49f6c59ab672534c2bbb14c175c09a265a606a2cade7dd094b30daf2957f0e59ba0f377
 DIST extra-1.4.2.tar.gz 31311 SHA256 0ea699d56bb08ad6e70ee6aaa2069326c2bc76ac347c0f04e94ce38cf3ec30c1 SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409 WHIRLPOOL f8090b12f6412d9a15b115cad88b760053844549e5132a2def334f2ced98c51d3e87d45786bdaa55c862bcafea054211c4d2f3bea81f134b0c8e60a3f81c89c6
diff --git a/dev-haskell/extra/extra-1.4.10.ebuild b/dev-haskell/extra/extra-1.4.10.ebuild
new file mode 100644
index 000000000000..5bd9ccb01b16
--- /dev/null
+++ b/dev-haskell/extra/extra-1.4.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra functions I use"
+HOMEPAGE="https://github.com/ndmitchell/extra#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 6aa5c47dfb77..67c594fbccc4 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -2,3 +2,4 @@ DIST haskell-src-exts-1.13.5.tar.gz 291329 SHA256 7c5adc74bc76b26a2ba7de6927877c
 DIST haskell-src-exts-1.14.0.tar.gz 291256 SHA256 0de416845e5ccc284aef029cbde25f5d289be464bcecaa28cb9e7753b886131c SHA512 7d1dc90742ffb1cbde209fcadad05a8c6bc3a731267f92a201533c1d841a6aef144af501ea2e4076a99b0f50734d7823574f581411c4440657ac7f6eeb5880c2 WHIRLPOOL 5b971996341b7a4aac79306e5a002de84e064bd84aa2addd2a91875da9e11e68e0ddb8c1ba06ff9361f6b83960a534c480f4c7ea4147818dfa629ee75d4d48f9
 DIST haskell-src-exts-1.15.0.1.tar.gz 1605910 SHA256 85f475693a87fd26a3a8b32dea2660bfdca35c2b5d11506ab11b1dc20c88e576 SHA512 d6fe854b2e7a13bb90815848517843ee67faad7e03d5abf6afc9e97252bcb9d915b51d94b757354a9e83b255f9b795e5c9fa2e3e962acd84772eaa9844d9b1d6 WHIRLPOOL d5970f6d9e27e24ac79c223804e56e874663b0f199b340c1a6e7051995c36411a791ac32529c9f3b9df5d22c2498319baed3afcfb27912f034a32529b36905a3
 DIST haskell-src-exts-1.16.0.1.tar.gz 1410081 SHA256 3f3bd41ad3a346a78e80195eca83de529d3ece63fa7edcd4df3b8bf40a970fc1 SHA512 b74a824899cbf85a2bf58c7c14df33fac7e70bbb775b51d8a861172da88d1dc6db3644a6534c9076a9c5499023a347cdce7e24b3495045d11a905f31a51492d0 WHIRLPOOL 1d4e8a95070f8f7a093aa9c41d7116e420438bc1e4b39dd12d01abfec9327c58f8faef1a31c14a982767e8cd24b0b1599e3e2719408b10e5dbfef88b13da7a40
+DIST haskell-src-exts-1.17.1.tar.gz 2489624 SHA256 ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2 WHIRLPOOL db49113e37ae8f402c88edde3643a0b6e14c9eb614f30170141ae0e366b07b01976d8acc321683996f9fd275247c04703df76501d11f4ee05048d44a51c638d3
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
new file mode 100644
index 000000000000..064af1115a1f
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
+HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RESTRICT=test # very slow
+
+RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	dev-haskell/happy
+	test? ( dev-haskell/mtl
+		dev-haskell/pretty-show
+		>=dev-haskell/smallcheck-1.0
+		dev-haskell/syb
+		>=dev-haskell/tasty-0.3
+		>=dev-haskell/tasty-golden-2.2.2
+		dev-haskell/tasty-smallcheck )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
index 0f6b1c8e9bf1..bb183368d54a 100644
--- a/dev-haskell/haskell-src-meta/Manifest
+++ b/dev-haskell/haskell-src-meta/Manifest
@@ -1,2 +1,3 @@
 DIST haskell-src-meta-0.6.0.10.tar.gz 19432 SHA256 c15f7e3bd196d80e1458ee1925b5f194feaabfb050eb680ca68efc156bf48c3a SHA512 efd6e06dc856c05b815a8a36f3411f3d5c171ad5cd84be75baaef1d7a784f3f32d81e9de175fb2ab2455ab6f3a80c2f743e4a277964816d6e8198bc4bf67ab4d WHIRLPOOL 8ba230cedd597aa65a964a031f134ad36a3411e1ca1f8c64a181022faa75e218fc4c5eebda589dc028eafcc555582717ed5732221e36b01a56493ac8b1caf78a
+DIST haskell-src-meta-0.6.0.14.tar.gz 20079 SHA256 769124392398695667c800225cd908cb455dadf54a9317870bd9384e0eeb20c9 SHA512 d043ece8f28a47572f59cfc36a9d7b2c505a3d5c2ef24f0e90496c5d57b88791417234777e146a0e75c0fba10775ba41e627a00519c2e9718bf173d95e2a201f WHIRLPOOL 47264a8f8d3dfc696a6eec4cdd377d51977883e8a1972db9327d470883c80980d8183793c5f5987172feae11bb734c79ec7f96e00d02c8ad5550f07ea25a4d94
 DIST haskell-src-meta-0.6.0.8.tar.gz 19449 SHA256 d3f69a05701d85880472c9d30efb3056fc8733f5f31e1795280aaf9f2c1262bb SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751 WHIRLPOOL 436fde45e32fea88107a4462ad2392d7caffdee705a8537d54d1bbff3e1e9c0a3f3d526a84361b704be933fdf0633e25eb1581228084afbb40774308f4062138
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
new file mode 100644
index 000000000000..a1e6d3f40802
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parse source to template-haskell abstract syntax"
+HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
+	>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
+	>=dev-lang/ghc-7.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/hcg-minus/Manifest b/dev-haskell/hcg-minus/Manifest
new file mode 100644
index 000000000000..0cd014366cdf
--- /dev/null
+++ b/dev-haskell/hcg-minus/Manifest
@@ -0,0 +1 @@
+DIST hcg-minus-0.15.tar.gz 12997 SHA256 b9b422e807f030b35c2d01971dfff9806a11fdb20f506ffde004a4933571e011 SHA512 875b89656a5340bbd9a303a98004bc13d2b7b37fc58762c9a4f96abbb78ec3e67403a5968f8b9ff59d955aaa3d2031eba45cee85a2ec19c442f31ad0f413da45 WHIRLPOOL ca50e07c158f8b871f3b142b3742638a998013562bad0f5465da8380573e2e5f43439cb71a9a084ce23672ef9e8507d5b4d840ffa6743d715e865f7146883bc1
diff --git a/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild b/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
new file mode 100644
index 000000000000..a82b259666b3
--- /dev/null
+++ b/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="haskell cg (minus)"
+HOMEPAGE="http://rd.slavepianos.org/t/hcg-minus"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/colour:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/hcg-minus/metadata.xml b/dev-haskell/hcg-minus/metadata.xml
new file mode 100644
index 000000000000..e019a95fc97b
--- /dev/null
+++ b/dev-haskell/hcg-minus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		cg (minus) library
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
new file mode 100644
index 000000000000..09f80bf27eca
--- /dev/null
+++ b/dev-haskell/hcodecs/Manifest
@@ -0,0 +1 @@
+DIST HCodecs-0.5.tar.gz 24232 SHA256 b1bf109a5e0877b47eb2f942ad0d1aa2368b9c006882ba07fe345dd0a90a1756 SHA512 40ee73995c06b34b799f1e8bd310faadc6ab267735313bdb62c0fb7ea95c13e3b443fc230cd529eb5f8ce02685d0506c80bcab3e802f2c407ef7584f6abdbe1d WHIRLPOOL 5c567cc98531de0da8822f8596196cdc3152855cb5ca05f41f0e8aea83180827ecc44120a41c55901ca2e3f32a1cb94dc7ed72e1a7927cfaea03af11a05be2b2
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.ebuild
new file mode 100644
index 000000000000..1ad37cd8584f
--- /dev/null
+++ b/dev-haskell/hcodecs/hcodecs-0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HCodecs"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
+HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # hung?
+
+RDEPEND=">=dev-haskell/quickcheck-2.0:2=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hcodecs/metadata.xml b/dev-haskell/hcodecs/metadata.xml
new file mode 100644
index 000000000000..4ac3a65a9972
--- /dev/null
+++ b/dev-haskell/hcodecs/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The library provides functions to read, write and manipulate MIDI, WAVE and SoundFont2 multimedia files. It is written entirely in Haskell (without any FFI). It uses efficient  parsing and building combinators for binary data stored in ByteStrings (based on the one in 'binary' package).
+		
+		Correctness of significant parts of the library has been validated with QuickCheck and Haskell Program Coverage (HPC) tool-kits.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
index 0db3b7dc9ee2..e3db2ce0ce01 100644
--- a/dev-haskell/hlint/Manifest
+++ b/dev-haskell/hlint/Manifest
@@ -1,2 +1,3 @@
 DIST hlint-1.8.57.tar.gz 79071 SHA256 a47e1cccf84ecd1fc61f1c63447725d4a917f530e7ddd6954b0ad6d1a4bf4e18 SHA512 1fca029067cf34f9d024640fbacfc455e733adb239e339471131b014c3d5cab671e5c267d855d1df7dd76440dab45a8981502dd840073005a4e5c50d177f91da WHIRLPOOL 81d94af7396cbbe447a5b7ea7669c7819947445fa7d4519670476968e3ad7d74c072c2f849e2b2ecca62a13777ebfad51c82ccc02b6c17f85889883bcc754f9e
 DIST hlint-1.9.21.tar.gz 88802 SHA256 8694a193e0f55b9a74ddd4fb44a242872f91e36ea59dd96ab489562a65cb6393 SHA512 e7e87aba3905bb577d952a960a92038816bf057ed19aa85cff0deaa653a9c248b6a4b44b907024ad271abf615ab94ebac6f4801c77f545cadbddf0db57f13ad8 WHIRLPOOL 2e29f48bb96a58161a2b09392c8a2f253656f300adaf7346cea7dac1e8035abd95a0bedd7ea744668c5333e6328cfa9a144e758966075cdc207d7777dcdef162
+DIST hlint-1.9.35.tar.gz 97402 SHA256 5e6289dadc77a0862ee12ec09136059011fd779c96ff6ffeec899170a97d7a8a SHA512 14daa5ad5652f93b3e3c4d5cff1df3735755c1561c2eb6c7ae3d05401d4a253ccba87d0cb5d09e690ce1a30f0352a26839856dd648bb10a13013cb43aed28606 WHIRLPOOL 722cc23bcb796ee077313b19f8cba7c1d22ed4a55f2da9d93f704b941e5dcc7795dbbf6b6820237f81e4012cebd312cf2bceda5df5c6f85b2a1a505a95c3b93d
diff --git a/dev-haskell/hlint/hlint-1.9.35.ebuild b/dev-haskell/hlint/hlint-1.9.35.ebuild
new file mode 100644
index 000000000000..9ca244d7f1f2
--- /dev/null
+++ b/dev-haskell/hlint/hlint-1.9.35.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal elisp-common
+
+DESCRIPTION="Source code suggestions"
+HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +gpl"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
+	>=dev-haskell/cmdargs-0.10:=[profile?]
+	>=dev-haskell/cpphs-1.20.1:=[profile?]
+	>=dev-haskell/extra-1.4.9:2=[profile?]
+	>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
+	>=dev-haskell/refact-0.3:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-haskell/uniplate-1.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_configure() {
+	local threaded_flag=""
+	if $(ghc-supports-threaded-runtime); then
+		threaded_flag="--flags=threaded"
+	else
+		threaded_flag="--flags=-threaded"
+	fi
+
+	haskell-cabal_src_configure \
+		$(cabal_flag gpl gpl) \
+		$threaded_flag
+}
+
+src_compile() {
+	cabal_src_compile
+
+	use emacs && elisp-compile data/hs-lint.el
+}
+
+src_install() {
+	cabal_src_install
+
+	if use emacs; then
+		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	doman data/hlint.1
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	haskell-cabal_pkg_postrm
+	use emacs && elisp-site-regen
+}
diff --git a/dev-haskell/hps/Manifest b/dev-haskell/hps/Manifest
new file mode 100644
index 000000000000..e25449b28000
--- /dev/null
+++ b/dev-haskell/hps/Manifest
@@ -0,0 +1 @@
+DIST hps-0.15.tar.gz 12111 SHA256 30df792e10ce0a2d2886ce5b6b081e95640cc00d02d9f2aa6426e7919eccb54e SHA512 19b86161b46d523357863acbbdc8b7311e9f6b286429dbf1f56e044ced578d7c7026315d02b50ef831b3bce412ca623082956039181e832fb766e30729ea27c6 WHIRLPOOL 07c0eafb85cf6fdcc543ca7acfac7a38e27389002dc3a87653da97e2fb1b97789894e1b5ed6f89681cee8149abd9b1a5ff78b7838de4bb92bfdd35b21a5fbd7e
diff --git a/dev-haskell/hps/hps-0.15.ebuild b/dev-haskell/hps/hps-0.15.ebuild
new file mode 100644
index 000000000000..16a1ca8bc0fd
--- /dev/null
+++ b/dev-haskell/hps/hps-0.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell Postscript"
+HOMEPAGE="http://rd.slavepianos.org/?t=hps"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="build-exec"
+
+RDEPEND=">=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	build-exec? ( dev-haskell/random:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag build-exec build-exec)
+}
diff --git a/dev-haskell/hps/metadata.xml b/dev-haskell/hps/metadata.xml
new file mode 100644
index 000000000000..d47195469b5a
--- /dev/null
+++ b/dev-haskell/hps/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="build-exec">Build the `hps-fractals' executable</flag>
+	</use>
+	<longdescription>
+		Haskell library partially implementing the
+		postscript drawing model.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
new file mode 100644
index 000000000000..d9f48bca9311
--- /dev/null
+++ b/dev-haskell/htf/Manifest
@@ -0,0 +1 @@
+DIST HTF-0.13.1.0.tar.gz 78310 SHA256 1cb469ee21766fb7ad56fb42469709fac06214f7a33c39880134dfc2ea0de847 SHA512 1292f8f0b9189e1ce05de1cf6f686ce77a839c4191a5f8b8000c8d740abe4b8f457a7c5ed8aadc13221fe9fde9b4c15bde9f9f6f53ac03178cd1884572fb4069 WHIRLPOOL 76f85fc1710d598ac38bb7849467536af705d9ab82811745212c28ae0a2e5c8fac588320e30f3c44b173665dfb60089c37610ac669f075bf6ef74f255508baff
diff --git a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch b/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
new file mode 100644
index 000000000000..ac1472051eba
--- /dev/null
+++ b/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
@@ -0,0 +1,9 @@
+diff --git a/tests/TestHTF.hs b/tests/TestHTF.hs
+index 4a71874..c0442a5 100644
+--- a/tests/TestHTF.hs
++++ b/tests/TestHTF.hs
+@@ -383,3 +383,3 @@ checkOutput output =
+           BSL.toStrict $
+-          J.encodePretty' (J.Config 2 J.compare) json
++          J.encodePretty' (J.defConfig { J.confIndent = J.Spaces 2, J.confCompare = J.compare }) json
+ 
diff --git a/dev-haskell/htf/htf-0.13.1.0.ebuild b/dev-haskell/htf/htf-0.13.1.0.ebuild
new file mode 100644
index 000000000000..758bbc02f343
--- /dev/null
+++ b/dev-haskell/htf/htf-0.13.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Haskell Test Framework"
+HOMEPAGE="https://github.com/skogsbaer/HTF/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/cpphs-1.19:=[profile?]
+	>=dev-haskell/diff-0.3:=[profile?]
+	dev-haskell/haskell-src:=[profile?]
+	>=dev-haskell/hunit-1.2.5:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?]
+	>=dev-haskell/old-time-1.0:=[profile?]
+	>=dev-haskell/quickcheck-2.3:2=[profile?]
+	>=dev-haskell/random-1.0:=[profile?]
+	>=dev-haskell/regex-compat-0.92:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-haskell/xmlgen-0.6:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( dev-haskell/aeson-pretty
+		>=dev-haskell/temporary-1.1
+		>=dev-haskell/unordered-containers-0.2 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-aeson-pretty-0.8.patch
+}
diff --git a/dev-haskell/htf/metadata.xml b/dev-haskell/htf/metadata.xml
new file mode 100644
index 000000000000..c786b01278af
--- /dev/null
+++ b/dev-haskell/htf/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The Haskell Test Framework (/HTF/ for short) lets you define unit
+		tests (&lt;http://hunit.sourceforge.net&gt;), QuickCheck properties
+		(&lt;http://www.cs.chalmers.se/~rjmh/QuickCheck/&gt;), and black box
+		tests in an easy and convenient way. The HTF uses a custom
+		preprocessor that collects test definitions automatically.
+		Furthermore, the preprocessor allows the HTF to report failing
+		test cases with exact file name and line number information.
+		
+		The documentation of the "Test.Framework.Tutorial" module
+		provides a tutorial for the HTF.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/icalendar/Manifest b/dev-haskell/icalendar/Manifest
new file mode 100644
index 000000000000..12d131815ccb
--- /dev/null
+++ b/dev-haskell/icalendar/Manifest
@@ -0,0 +1 @@
+DIST iCalendar-0.4.0.3.tar.gz 29889 SHA256 bc06a08165e2c135a2c98d0ca08cfd2b0862134337342b9f3da65f878c4e7a35 SHA512 504c562a8213a899071941fc3ebce59354885a4d5b680950eb9eee8a0b1704475e91fbbffb8773d6ae5f9c124dd1fd3c39aae369f7305bf4d7ca9430984070c8 WHIRLPOOL 9dcaaf8da25fa8d17f76f3bf372c11cddc489f866efa6594b578f2a7ef9bf2f0e19bed62e9cdd7bff1c36960722fc33ef3063469b21679c87feb21dbc3ece634
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
new file mode 100644
index 000000000000..c6f7ea86cc2e
--- /dev/null
+++ b/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="iCalendar"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="iCalendar data types, parser, and printer"
+HOMEPAGE="https://github.com/chrra/iCalendar"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/case-insensitive-0.4:=[profile?]
+	>=dev-haskell/data-default-0.3:=[profile?]
+	>=dev-haskell/mime-0.4.0.2:=[profile?]
+	>=dev-haskell/mtl-2.1.0:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/parsec-3.1.0:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/icalendar/metadata.xml b/dev-haskell/icalendar/metadata.xml
new file mode 100644
index 000000000000..134a49d930a0
--- /dev/null
+++ b/dev-haskell/icalendar/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="network-uri">use network-uri package</flag>
+	</use>
+	<longdescription>
+		Data definitions, parsing and printing of the iCalendar
+		format (RFC5545).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/idiii/Manifest b/dev-haskell/idiii/Manifest
new file mode 100644
index 000000000000..1c2509face97
--- /dev/null
+++ b/dev-haskell/idiii/Manifest
@@ -0,0 +1 @@
+DIST idiii-0.1.3.3.tar.gz 103560 SHA256 10f1b88fdc02f11e1d7d5d309d637ed3b032976ed4c0fc90985c6a53a42aa984 SHA512 31d993aad1891d1d673bf4cebaf639cf20c4cbf9835eb808a5d241e9933a8b2e64a33465d8a77950d9aa2afe4ae6985e4d62d890b7a52701792e3f5c7bf70547 WHIRLPOOL 43d36e86e5b21fe9eb3220ff295da9c706771f4548b146506faac52744a8b3d836d67f3dfdcf2aab6605222df7aef30f22def33faf5e0cf50b02c96f10f75c9c
diff --git a/dev-haskell/idiii/idiii-0.1.3.3.ebuild b/dev-haskell/idiii/idiii-0.1.3.3.ebuild
new file mode 100644
index 000000000000..fd3324697f18
--- /dev/null
+++ b/dev-haskell/idiii/idiii-0.1.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ID3v2 (tagging standard for MP3 files) library"
+HOMEPAGE="http://hackage.haskell.org/package/idiii"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test #missing files
+
+RDEPEND="dev-haskell/data-accessor:=[profile?]
+	dev-haskell/missingh:=[profile?]
+	dev-haskell/polyparse:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/idiii/metadata.xml b/dev-haskell/idiii/metadata.xml
new file mode 100644
index 000000000000..84a397179159
--- /dev/null
+++ b/dev-haskell/idiii/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		ID3v2 (tagging standard for MP3 files) library
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-bash/Manifest b/dev-haskell/language-bash/Manifest
new file mode 100644
index 000000000000..db910010b433
--- /dev/null
+++ b/dev-haskell/language-bash/Manifest
@@ -0,0 +1 @@
+DIST language-bash-0.6.1.tar.gz 20224 SHA256 7fb4fb293aec5f3c9b0e7ca2b99f895115d1bbe13f8dbfe02003560e3c063c8d SHA512 2dfb3344a0bd15051f2d3f8bdb7185154b019141473e7f56b0decc1b840880bcccf69a910b16ef1958f149c5df5e90a4e7b6035b75b52c21d5829b018f66c143 WHIRLPOOL eee6a2d737c23c26f5f3349010dbca8e3724f273a72f4c0b1fbf7e13d63c3b7c9fbf897eaf4c550003f6f76720c3e0fea1376ead766f15b720a1d6f6e51d0314
diff --git a/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch b/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch
new file mode 100644
index 000000000000..be5f6dc49a1e
--- /dev/null
+++ b/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch
@@ -0,0 +1,8 @@
+diff --git a/src/Language/Bash/Word.hs b/src/Language/Bash/Word.hs
+index ce36c4a..b9392a9 100644
+--- a/src/Language/Bash/Word.hs
++++ b/src/Language/Bash/Word.hs
+@@ -7,2 +7,3 @@
+   , TypeSynonymInstances
++  , OverlappingInstances
+   #-}
diff --git a/dev-haskell/language-bash/language-bash-0.6.1.ebuild b/dev-haskell/language-bash/language-bash-0.6.1.ebuild
new file mode 100644
index 000000000000..381c0623328a
--- /dev/null
+++ b/dev-haskell/language-bash/language-bash-0.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing and pretty-printing Bash shell scripts"
+HOMEPAGE="https://github.com/knrafto/language-bash/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.patch)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
+}
diff --git a/dev-haskell/language-bash/metadata.xml b/dev-haskell/language-bash/metadata.xml
new file mode 100644
index 000000000000..d83233f04ef3
--- /dev/null
+++ b/dev-haskell/language-bash/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A library for parsing, pretty-printing, and manipulating
+		Bash shell scripts.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-css/Manifest b/dev-haskell/language-css/Manifest
new file mode 100644
index 000000000000..e34e93063fa5
--- /dev/null
+++ b/dev-haskell/language-css/Manifest
@@ -0,0 +1 @@
+DIST language-css-0.0.3.tar.gz 18953 SHA256 2f459ba844a6df5e2c2ba8f696ae15e14263ddc259c771c81885909f118015bc SHA512 49e6223763f61892342b300b14ee372d27fb7fa4036965f026ca13f290ab6b949e1e2aa1fd679b479d004614a25d38da9bddd5b1f14af9e9c8e2211504880858 WHIRLPOOL 79c3ee7b259db75acac1cbc2fc487a398bf228afdaddff0fff3e0924405c9ff705e47161ca804a8a5ea2454cb24c363795513a9dcde7ecc9ad373a0d73617ca9
diff --git a/dev-haskell/language-css/language-css-0.0.3.ebuild b/dev-haskell/language-css/language-css-0.0.3.ebuild
new file mode 100644
index 000000000000..162c92276b4b
--- /dev/null
+++ b/dev-haskell/language-css/language-css-0.0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="CSS 2.1 syntax"
+HOMEPAGE="http://hackage.haskell.org/package/language-css"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
diff --git a/dev-haskell/language-css/metadata.xml b/dev-haskell/language-css/metadata.xml
new file mode 100644
index 000000000000..0dbf5f82cad6
--- /dev/null
+++ b/dev-haskell/language-css/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		library for building and pretty printing CSS 2.1 code
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-dot/Manifest b/dev-haskell/language-dot/Manifest
new file mode 100644
index 000000000000..88b45c78d6c7
--- /dev/null
+++ b/dev-haskell/language-dot/Manifest
@@ -0,0 +1 @@
+DIST language-dot-0.1.0.tar.gz 8042 SHA256 15418f000c45efd129d98698d3258ff7996c66c7c9374072334868d2550b1581 SHA512 4166a345a31d075f6492cd519dff19b5ec4fb4c4a953ef4ddaa92acdad618a2b61271d5eaa87920b6541d7f0d72611887ed2a68764d7fa446c31db66501b1467 WHIRLPOOL 9a1838047968e94963d541804dcda2e966e3f012ac11131d8faa395c41abdc56382419a5c1ff001a4dee34e7d0f5866995ee46aac2773887f335bfcf78fb64e7
diff --git a/dev-haskell/language-dot/language-dot-0.1.0.ebuild b/dev-haskell/language-dot/language-dot-0.1.0.ebuild
new file mode 100644
index 000000000000..ac80fbca1f01
--- /dev/null
+++ b/dev-haskell/language-dot/language-dot-0.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for the analysis and creation of Graphviz DOT files"
+HOMEPAGE="http://hackage.haskell.org/package/language-dot"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+executable"
+
+RDEPEND=">=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/language-dot/metadata.xml b/dev-haskell/language-dot/metadata.xml
new file mode 100644
index 000000000000..95a3923b92cc
--- /dev/null
+++ b/dev-haskell/language-dot/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="executable">Build the `ppdot' executable</flag>
+	</use>
+	<longdescription>
+		A library for the analysis and creation of Graphviz DOT files.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
new file mode 100644
index 000000000000..53580b28c279
--- /dev/null
+++ b/dev-haskell/language-ecmascript/Manifest
@@ -0,0 +1 @@
+DIST language-ecmascript-0.17.1.0.tar.gz 55540 SHA256 df1e3f0d3096d522f278c644d3efbedabee29e2babfdf9d497287550f017883e SHA512 20a007e2934fc1778cdc5cac123a08b534ec36bec0b6f789f7c4b68c46b548b1e898f123ff1b7512905e28a1dc78e19d6bf517ced28ffcfbafb539f82f073f91 WHIRLPOOL 6dde567152f6e8749c351b2a5a105ddd6a9a31de97b42a7828965cd2c5fd4a841f4f5a5f4cfaad4863b49167456fbc6af22605483e95a71e3929a11bf9ae90bd
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild
new file mode 100644
index 000000000000..6d70cfb1421b
--- /dev/null
+++ b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="JavaScript parser and pretty-printer library"
+HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
+	>=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?]
+	>=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+	>=dev-haskell/testing-feat-0.4.0.2:=[profile?] <dev-haskell/testing-feat-0.5:=[profile?]
+	>=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
+	>=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'data-default-class >= 0.0.1 && < 0.1' 'data-default-class >= 0.0.1'
+}
diff --git a/dev-haskell/language-ecmascript/metadata.xml b/dev-haskell/language-ecmascript/metadata.xml
new file mode 100644
index 000000000000..2556fa32ca32
--- /dev/null
+++ b/dev-haskell/language-ecmascript/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Some tools for working with ECMAScript 3 (popularly known as JavaScript).
+		Includes a parser, pretty-printer, and basic building blocks for more
+		sophisticated tools.
+		This package used to be called WebBits.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-glsl/Manifest b/dev-haskell/language-glsl/Manifest
new file mode 100644
index 000000000000..9465e0ad329c
--- /dev/null
+++ b/dev-haskell/language-glsl/Manifest
@@ -0,0 +1 @@
+DIST language-glsl-0.2.0.tar.gz 16432 SHA256 236348543fb992e7cc563f80e1118ba942527ad295eba1a9466a30165cfcaef2 SHA512 b7044d7ae11c8bdd63d38d7ee1c3e880a0201a7c72bb16596ecc2e32a61e37e973a8b2aa25342737f2d2133c679f479628ae78812ea773a53cd34eb941ea6d7e WHIRLPOOL a80fd40e37466311ec4e6257c24a36e7e33dac19d61f79c5321ebd5775232f09f279a5b197a9174685f0846e974eaf74a20540c128b853855f2f775d87f8461a
diff --git a/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild b/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild
new file mode 100644
index 000000000000..c0f6697342c7
--- /dev/null
+++ b/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="GLSL abstract syntax tree, parser, and pretty-printer"
+HOMEPAGE="http://hackage.haskell.org/package/language-glsl"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+	dev-haskell/prettyclass:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
diff --git a/dev-haskell/language-glsl/metadata.xml b/dev-haskell/language-glsl/metadata.xml
new file mode 100644
index 000000000000..a4b3e69d46c1
--- /dev/null
+++ b/dev-haskell/language-glsl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The package language-glsl is a Haskell library for the
+		representation, the parsing, and the pretty-printing of
+		GLSL 1.50 code.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-lua/Manifest b/dev-haskell/language-lua/Manifest
new file mode 100644
index 000000000000..b71e11fbdf95
--- /dev/null
+++ b/dev-haskell/language-lua/Manifest
@@ -0,0 +1 @@
+DIST language-lua-0.10.0.tar.gz 145929 SHA256 0c2012b6dfe5127158d8300cca11c18ef3be428e010e05d4bd6e1ec9f3fd3c62 SHA512 9b43e3e67f54e25e82c3f1fb9fa81be31509aab01084ef95e6eddbef71fb5df7d9e58816fa51db95f8febe66fa77c52d62b15a7060dfa6a845b662b0b16dac15 WHIRLPOOL c9935a61defd975cbc239824e128ebd0028faff7f04a53021bc00565df0aebe78875fe31b5fb9fdfb739a5a2d542a87c917f6c45866d80778614aabac28f8f35
diff --git a/dev-haskell/language-lua/language-lua-0.10.0.ebuild b/dev-haskell/language-lua/language-lua-0.10.0.ebuild
new file mode 100644
index 000000000000..c6971ce55854
--- /dev/null
+++ b/dev-haskell/language-lua/language-lua-0.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua parser and pretty-printer"
+HOMEPAGE="https://github.com/glguy/language-lua"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.16.0
+	dev-haskell/happy
+	test? ( dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/language-lua/metadata.xml b/dev-haskell/language-lua/metadata.xml
new file mode 100644
index 000000000000..95930f09bac4
--- /dev/null
+++ b/dev-haskell/language-lua/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Lua 5.3 lexer, parser and pretty-printer.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/language-python/Manifest b/dev-haskell/language-python/Manifest
new file mode 100644
index 000000000000..e91382dc6f03
--- /dev/null
+++ b/dev-haskell/language-python/Manifest
@@ -0,0 +1 @@
+DIST language-python-0.5.4.tar.gz 153417 SHA256 ba93508e5e7b6b3c881eb9b04f9032c2e8c5f20255d812a0a365eba82ffbf129 SHA512 adbe81eeb4a161c8e685c3dacdee0924f1193fa291a753e1608f0c94effc90b77df60fee1e46e791516d01ea0153f243c13fb2fdd24d688cfe9ce8ac9ed44059 WHIRLPOOL 0bb5011b4df61afa45259901d09d5163e44c80214176de6e24335e627d1d8ae1e1fae645c4521093ce7424de43ea227bcb335fcfb1d0f09c06c7092e734e777c
diff --git a/dev-haskell/language-python/language-python-0.5.4.ebuild b/dev-haskell/language-python/language-python-0.5.4.ebuild
new file mode 100644
index 000000000000..393f8634b0d8
--- /dev/null
+++ b/dev-haskell/language-python/language-python-0.5.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing and pretty printing of Python code"
+HOMEPAGE="https://github.com/bjpop/language-python"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
+	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.18.1.3
+	dev-haskell/happy
+"
diff --git a/dev-haskell/language-python/metadata.xml b/dev-haskell/language-python/metadata.xml
new file mode 100644
index 000000000000..506efcca4a2e
--- /dev/null
+++ b/dev-haskell/language-python/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		language-python is a Haskell library for lexical analysis, parsing
+		and pretty printing Python code. It supports versions 2.x and 3.x of Python.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
new file mode 100644
index 000000000000..f776243d5437
--- /dev/null
+++ b/dev-haskell/linear/Manifest
@@ -0,0 +1 @@
+DIST linear-1.20.5.tar.gz 44886 SHA256 61d8b7242f1e7c27925df7ffe1aa8b1fd732e61598f3af48b9999d8fb464cc0d SHA512 a45e38d5b25f53b809a67c17e0b532b96e9766d0e81d2da0265c93a9976cdbb183c60dce79eda17259d4169cc25884cc4831a24b93ccd43709df374ce5187600 WHIRLPOOL 9fb5d3dac0e5aff00c17eead494abc01429c369c7fde88b235b6554c1df664aa9099aa319cf98fb561c07b95fc422892cd88b820a96f85f1693fc349c9ef8a1b
diff --git a/dev-haskell/linear/linear-1.20.5.ebuild b/dev-haskell/linear/linear-1.20.5.ebuild
new file mode 100644
index 000000000000..3960e0774ec9
--- /dev/null
+++ b/dev-haskell/linear/linear-1.20.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: -herbie
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Linear Algebra"
+HOMEPAGE="https://github.com/ekmett/linear/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
+	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
+	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
+	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?]
+	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
+	>=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.12
+		>=dev-haskell/hunit-1.2.5
+		>=dev-haskell/simple-reflect-0.3.1
+		>=dev-haskell/test-framework-0.8
+		>=dev-haskell/test-framework-hunit-0.3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-herbie \
+		$(cabal_flag template-haskell template-haskell)
+}
diff --git a/dev-haskell/linear/metadata.xml b/dev-haskell/linear/metadata.xml
new file mode 100644
index 000000000000..4cd424e49e6c
--- /dev/null
+++ b/dev-haskell/linear/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Types and combinators for linear algebra on free vector spaces
+	</longdescription>
+<use>
+  <flag name="template-haskell">You can disable the use of the
+  `template-haskell` package using `-f-template-haskell`. Disabling this is an
+  unsupported configuration, but it may be useful for accelerating builds in
+  sandboxes for expert users.</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-haskell/memotrie/Manifest b/dev-haskell/memotrie/Manifest
new file mode 100644
index 000000000000..f0a7bef578a8
--- /dev/null
+++ b/dev-haskell/memotrie/Manifest
@@ -0,0 +1 @@
+DIST MemoTrie-0.6.4.tar.gz 7695 SHA256 4238c8f7ea1ecd2497d0a948493acbdc47728b2528b6e7841ef064b783d68b1c SHA512 5700a36ae2a53e84bc31d80765afff3041972b4b64da359e16e7981009cc581d9c8aac019eb46d44d5dba7080dad494587ad1f4256f101387eb6de2959dd659f WHIRLPOOL 29e23cad959c609585155967c300aa223eec1dbc5db79bb97ff4dca6d97431ae68a02a245c0db1f7244f49aece89dc913d806e610010c690377edb60ab4d981f
diff --git a/dev-haskell/memotrie/memotrie-0.6.4.ebuild b/dev-haskell/memotrie/memotrie-0.6.4.ebuild
new file mode 100644
index 000000000000..57776785906f
--- /dev/null
+++ b/dev-haskell/memotrie/memotrie-0.6.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="bin lib profile" #broken haddock: haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="MemoTrie"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Trie-based memo functions"
+HOMEPAGE="https://github.com/conal/MemoTrie"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-haskell/void:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples)
+}
diff --git a/dev-haskell/memotrie/metadata.xml b/dev-haskell/memotrie/metadata.xml
new file mode 100644
index 000000000000..baf6e5b02ea8
--- /dev/null
+++ b/dev-haskell/memotrie/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		MemoTrie provides a basis for memoized functions over some domains,
+		using tries.  It's based on some code I got from Spencer Janssen.
+		
+		Project wiki page: &lt;http://haskell.org/haskellwiki/MemoTrie&gt;
+		
+		&amp;#169; 2008,2009,2010 by Conal Elliott; BSD3 license.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/mime/Manifest b/dev-haskell/mime/Manifest
new file mode 100644
index 000000000000..060376a50a86
--- /dev/null
+++ b/dev-haskell/mime/Manifest
@@ -0,0 +1 @@
+DIST mime-0.4.0.2.tar.gz 9438 SHA256 e7fa283e5caa6371d5b3978e152412a2dd2489eec43aee722caca9dc14ea3875 SHA512 03fad3792a6935ea5ea75cc9756760277ad005db106cf6aa4f951a23e32d170bcb09dea399d2ace5b4f44afc2c73ec1b377f86b8f70616320490cd690ae4ea15 WHIRLPOOL 100440c9711dd428c31e6e9548daa925f1f57184991d42373e664ef74943b778627fd4b28cc7815fea8009e351603c19434d3ca5580cd050ba2824590b9530e5
diff --git a/dev-haskell/mime/metadata.xml b/dev-haskell/mime/metadata.xml
new file mode 100644
index 000000000000..0e9eada7f8f2
--- /dev/null
+++ b/dev-haskell/mime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Working with MIME types.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/mime/mime-0.4.0.2.ebuild b/dev-haskell/mime/mime-0.4.0.2.ebuild
new file mode 100644
index 000000000000..cff8e3aa5596
--- /dev/null
+++ b/dev-haskell/mime/mime-0.4.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Working with MIME types"
+HOMEPAGE="https://github.com/GaloisInc/mime"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/text-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/numinstances/Manifest b/dev-haskell/numinstances/Manifest
new file mode 100644
index 000000000000..8fdf71141237
--- /dev/null
+++ b/dev-haskell/numinstances/Manifest
@@ -0,0 +1 @@
+DIST NumInstances-1.4.tar.gz 4749 SHA256 cbdb2a49346f59ceb5ab38592d7bc52e5205580d431d0ac6d852fd9880e59679 SHA512 d36b6d924345142004c3fdfe5d329a8679ddab2763a117d80b7f8a7077cd98961696fdca573578ce2389bc54563a926445cb63c3d3b888a1c54d22bc329236c6 WHIRLPOOL 391e96cf238edceb770d71a6151dc1733ac11bc3c6ddc3eefbad781b0dff560398ef9bf2c74b71fed5beb5517932f81c3c42683b703ad44be24c66dcbc92fa5a
diff --git a/dev-haskell/numinstances/metadata.xml b/dev-haskell/numinstances/metadata.xml
new file mode 100644
index 000000000000..09e8970f3738
--- /dev/null
+++ b/dev-haskell/numinstances/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Instances of numeric classes for functions and tuples
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/numinstances/numinstances-1.4.ebuild b/dev-haskell/numinstances/numinstances-1.4.ebuild
new file mode 100644
index 000000000000..1fcadc20577d
--- /dev/null
+++ b/dev-haskell/numinstances/numinstances-1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="NumInstances"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Instances of numeric classes for functions and tuples"
+HOMEPAGE="https://github.com/conal/NumInstances"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/refact/Manifest b/dev-haskell/refact/Manifest
new file mode 100644
index 000000000000..cf09e154f3c3
--- /dev/null
+++ b/dev-haskell/refact/Manifest
@@ -0,0 +1 @@
+DIST refact-0.3.0.2.tar.gz 2345 SHA256 0ad029727797c8ca5d179c7abf1bfc135d86a7d72cf93785ee12ad243aeb1f6c SHA512 18f35a3f563288815645c4ef8e557a08bd9038aca0b3d9af391f9f71b39bbf779b725f037fa682a23e38e31cf7b8e0f4ae412e2af2ec3639c4b2c47a05a45a6e WHIRLPOOL 03293f884723846f86a5d986e160f0f0cc401bb0af99e38eef5e1f1787222bd883671c1a550ca7df6ce9805c2f1abd9ad3b7b73aa473408c0f94912687601854
diff --git a/dev-haskell/refact/metadata.xml b/dev-haskell/refact/metadata.xml
new file mode 100644
index 000000000000..ddc3a11c7614
--- /dev/null
+++ b/dev-haskell/refact/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This library provides a datatype which can be interpreted by apply-refact. It exists
+		as a seperate library so that applications can specify refactorings without depending on GHC.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/refact/refact-0.3.0.2.ebuild b/dev-haskell/refact/refact-0.3.0.2.ebuild
new file mode 100644
index 000000000000..542ce71e5c51
--- /dev/null
+++ b/dev-haskell/refact/refact-0.3.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Specify refactorings to perform with apply-refact"
+HOMEPAGE="http://hackage.haskell.org/package/refact"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/riff/Manifest b/dev-haskell/riff/Manifest
new file mode 100644
index 000000000000..91c20ea690ed
--- /dev/null
+++ b/dev-haskell/riff/Manifest
@@ -0,0 +1 @@
+DIST riff-0.3.0.1.tar.gz 9420 SHA256 abc1726fbcae31061a31df4d4d569b3c4090d5bfaa22e9f5af863d1b9e5ee0a4 SHA512 9b488fa0853dec662109809627c451ec22766595e710a14d25598e1232bc1e286a649a9fd4933bf42737b68554f1a0401c0fee12e833d6fd79b9eb989a4d23b2 WHIRLPOOL 6d09e2ffb56088801fe4d8eef473f9793408acd9b4d6ab8a6e013bdef9c2c3f0acff05e4027b50ee819bbad4deb60bf75faea45bdc0cbf289faad0027bae1ad8
diff --git a/dev-haskell/riff/metadata.xml b/dev-haskell/riff/metadata.xml
new file mode 100644
index 000000000000..6b1528d07115
--- /dev/null
+++ b/dev-haskell/riff/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This library provides a RIFF parser for Haskell for easy manipulation
+		of common file formats like WAVE and RIFF container AVI files.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/riff/riff-0.3.0.1.ebuild b/dev-haskell/riff/riff-0.3.0.1.ebuild
new file mode 100644
index 000000000000..d9daebba640d
--- /dev/null
+++ b/dev-haskell/riff/riff-0.3.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="RIFF parser for Haskell"
+HOMEPAGE="https://bitbucket.org/robertmassaioli/riff/overview"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/either-4.3:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'binary >=0.7 && <0.8' 'binary >=0.7' \
+		'either == 4.3.*' 'either >= 4.3' \
+		'filepath >=1.3 && <1.4' 'filepath >=1.3' \
+		'transformers == 0.4.*' 'transformers >= 0.4'
+}
diff --git a/dev-haskell/shell-escape/Manifest b/dev-haskell/shell-escape/Manifest
new file mode 100644
index 000000000000..ca42accb3dd4
--- /dev/null
+++ b/dev-haskell/shell-escape/Manifest
@@ -0,0 +1 @@
+DIST shell-escape-0.2.0.tar.gz 6066 SHA256 e23c9ba94a27e45430cb39e6bb236557e789d24129257c3def377f441b2cba4a SHA512 b2e8ae93b13619cd6801b0fb85e4783c2472a57f5162fb397d2cf00468290b0ca6189ba6a54b54efa68b2977d25ec02cdcf8d9c49f0d21cd6d6f1a030dd05db4 WHIRLPOOL d4eb22471ace7c681aa4d8311bda41770866e4a8848f56933b8d11af5940ad2d7f9055e045dc3ed6e9b746257baaea9e6bb2a5b94053cb0db64c4fcb1bcffabf
diff --git a/dev-haskell/shell-escape/metadata.xml b/dev-haskell/shell-escape/metadata.xml
new file mode 100644
index 000000000000..2e156eadd527
--- /dev/null
+++ b/dev-haskell/shell-escape/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Shell escaping library, offering both Bourne shell and Bash style escaping
+		of ByteStrings.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild b/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
new file mode 100644
index 000000000000..21e84e6e5c46
--- /dev/null
+++ b/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Shell escaping library"
+HOMEPAGE="https://github.com/solidsnack/shell-escape"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/vector-0.6.0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/system-posix-redirect/Manifest b/dev-haskell/system-posix-redirect/Manifest
new file mode 100644
index 000000000000..a670dee7971b
--- /dev/null
+++ b/dev-haskell/system-posix-redirect/Manifest
@@ -0,0 +1 @@
+DIST system-posix-redirect-1.1.0.1.tar.gz 3581 SHA256 53535011e64c1792052987bc1e8799222286c30c349dd36d3fc08c8612fa6ef2 SHA512 3a41668540ebff5ce706db331bb3c736895bd6a8fc11926884ff3e96622bb047c5b715468f4db81d0ac6acd15144ae9dbb71f087173244e29ba5b2a242f43c95 WHIRLPOOL ea57e93bb5ba662162501110a887ce5a0f4afff89dd55e825d7c1ccaffc795020bd14d898d4f087e5dc41da86952692ff52d0c58a5b93d50ccd20f995bf30e40
diff --git a/dev-haskell/system-posix-redirect/metadata.xml b/dev-haskell/system-posix-redirect/metadata.xml
new file mode 100644
index 000000000000..01dac7da10fe
--- /dev/null
+++ b/dev-haskell/system-posix-redirect/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Due to the design of POSIX, it is possible to temporarily overload the
+		file descriptors corresponding to stdout and stderr to point to an
+		arbitrary pipe. It is, however, tricky to get right. This module gets
+		it right, as far as such a terrible hack can be made right. It can be
+		used to make misbehaving third-party C libraries stop spewing to
+		standard output. Warning: the module author has concluded that due to
+		lack of portability, this module should not be used in any serious
+		sytem. But, for those who like living dangerously...
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild b/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
new file mode 100644
index 000000000000..9c4391d15b74
--- /dev/null
+++ b/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A toy module to temporarily redirect a program's stdout"
+HOMEPAGE="http://hackage.haskell.org/package/system-posix-redirect"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/tagshare/Manifest b/dev-haskell/tagshare/Manifest
new file mode 100644
index 000000000000..95835cec5904
--- /dev/null
+++ b/dev-haskell/tagshare/Manifest
@@ -0,0 +1 @@
+DIST tagshare-0.0.tar.gz 2127 SHA256 d2314bae2e6820700f2a61db9c9f7976e1b53547a49cdd3352bdf29ac3856ce0 SHA512 872592757bba6b21846888aeec1b36cc4f7c9cd602a299bb493763bd1c38d52d84419319a6761f5019e565081aceedc343cc1e52fcf5449a78e709da6164051f WHIRLPOOL 68e08f4b01819b7793e75edfc258640bbacf39f731a893ee623e21814ca0bbaa44608d34ca2d1c31eb2cf5ec9998df4caf9235ad97aa140f18ea06b2603487e3
diff --git a/dev-haskell/tagshare/metadata.xml b/dev-haskell/tagshare/metadata.xml
new file mode 100644
index 000000000000..5938819251da
--- /dev/null
+++ b/dev-haskell/tagshare/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		TagShare supplies a monad for sharing values based on tags
+		and types. Each tag and type is bound to at most one value
+		in a dynamic map.
+		
+		The principal use of this package is to ensure that
+		constant class members or other overloaded values are
+		shared.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/tagshare/tagshare-0.0.ebuild b/dev-haskell/tagshare/tagshare-0.0.ebuild
new file mode 100644
index 000000000000..602a5a0be0fb
--- /dev/null
+++ b/dev-haskell/tagshare/tagshare-0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="TagShare - explicit sharing with tags"
+HOMEPAGE="http://hackage.haskell.org/package/tagshare"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-1:=[profile?]
+		<dev-haskell/mtl-3:=[profile?]
+		>=dev-lang/ghc-7.4.2:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index fe655bd4dff1..644b835df5e2 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -1,3 +1,4 @@
 DIST tar-0.3.2.0.tar.gz 15952 SHA256 492d091041224f293ceb67b0f560a2f4e3f0a304117214ac87912f1495cbf47a SHA512 cbdfdd5f89a4547dc1f2a49074634eacef9d89a8d537ffef0980f0c33ca7feed71da9546d950b69d269a2d491dec3c5447219dd94adaf78bbc875d7718eee5c6 WHIRLPOOL 95d560edac007cecfc82eec4729a2ff821f8b53a59b70e5e45448817b8789b7f11051642799aa1e371cd4fc6704aa6fcb98b1ea319a0a2916293eb9b7297958e
 DIST tar-0.4.0.1.tar.gz 17875 SHA256 a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d SHA512 7cb042f77dc70b856b4dfd5d0a06620f669f9260a84800ad27e1803ec24a50932bb3775b35a6cc91cefb30ea4cd2b453dd6566007d586327acea0edccc0dee47 WHIRLPOOL 0abad23f2027a01136e28276735e4bd8abab2858ddcb1467e41bca780f573df410ea9b1c47b85c96fefabd7a471d32bf50fa26614f0cbaefb74ad0546f7289be
 DIST tar-0.4.2.1.tar.gz 29825 SHA256 2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080 SHA512 8684f20fd31a1d4c83fd6b74e6662eac8f8b0075856b47105c5dc72f39eee5ef3ddbf1b45d2cc730f924b385df4e74ff82a03ec45489662dac1b8b91170397f0 WHIRLPOOL 0a064308301357ffb46555d10ca0689a375f7d4e4c17acc1763f180102d91195dae2e42314f3dac53aa5e4f90afe3724a0f385bd3f8ba37dc0bd8186e8a6ef20
+DIST tar-0.5.0.3.tar.gz 38764 SHA256 d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3 SHA512 f90899e3a5fe097645e29b143cbf25ccf131f8b794bfea655e5b562369e4d7d492df78e53710d3ca4776233f07ace9335242eafbd3b4ba8d0e1d4664fd24a27d WHIRLPOOL c577f130f64503bd03daa91ddd482539c6e9fb16100d35b12eeec76d53cfb6ce33d979d0572038e89a6c6ddc48d48725549ebf462b52dcc69582dad2ce89a43d
diff --git a/dev-haskell/tar/tar-0.5.0.3.ebuild b/dev-haskell/tar/tar-0.5.0.3.ebuild
new file mode 100644
index 000000000000..3ef5ee518f60
--- /dev/null
+++ b/dev-haskell/tar/tar-0.5.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Reading, writing and manipulating \".tar\" archive files"
+HOMEPAGE="http://hackage.haskell.org/package/tar"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-haskell/bytestring-builder:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/bytestring-handle
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
+"
diff --git a/dev-haskell/testing-feat/Manifest b/dev-haskell/testing-feat/Manifest
new file mode 100644
index 000000000000..693cbdc53c0a
--- /dev/null
+++ b/dev-haskell/testing-feat/Manifest
@@ -0,0 +1 @@
+DIST testing-feat-0.4.0.3.tar.gz 17864 SHA256 34ca9c7849c4054b951cb359dc55ec1d24f5c2f7cf31d6211959778ad35407ce SHA512 0dabd9129472d9cf91b87a31aec9265369cdf58ec47fe74997df08097d4e93edb4f4bf52050bbca0c345e5993c12d0fcf755b94dd80093a33ba8fef366b08516 WHIRLPOOL b95d7d606679b39dc4f166600d5318fb918156543d292d7896bf4d456a8a66d2f2f1b92cedaf6c8c0d5bdb0ec067a4e6876e70803998d9b2c72c43ca7fb17f95
diff --git a/dev-haskell/testing-feat/metadata.xml b/dev-haskell/testing-feat/metadata.xml
new file mode 100644
index 000000000000..665eeb0f74e3
--- /dev/null
+++ b/dev-haskell/testing-feat/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Feat (Functional Enumeration of Abstract Types) provides
+		enumerations as functions from natural numbers to values
+		(similar to @toEnum@ but for any algebraic data type). This
+		can be used for SmallCheck-style systematic testing,
+		QuickCheck style random testing, and hybrids of the two.
+		
+		The enumerators are defined in a very boilerplate manner
+		and there is a Template Haskell script for deriving the
+		class instance for most types.
+		"Test.Feat" contain a subset of the other modules that
+		should be sufficient for most test usage. There
+		are some small and large example in the tar
+		ball.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild b/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild
new file mode 100644
index 000000000000..e9598d2da48d
--- /dev/null
+++ b/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Functional Enumeration of Algebraic Types"
+HOMEPAGE="http://hackage.haskell.org/package/testing-feat"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
+	<dev-haskell/tagshare-0.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/thyme/Manifest b/dev-haskell/thyme/Manifest
new file mode 100644
index 000000000000..56337ee3619c
--- /dev/null
+++ b/dev-haskell/thyme/Manifest
@@ -0,0 +1 @@
+DIST thyme-0.3.5.5.tar.gz 37220 SHA256 84c6701fb7b40841d22582202382c362fd9e0d6e5f1c959b7e0f2f91a85c796c SHA512 2f8bb307a49e441b3fe2a0337a25ef9adc94d3fe2f04369759bbdfba9ee788568016e8e9ce6dde2ef1ba51c61f98621f4dd35b833cab1757b022bf43524174b5 WHIRLPOOL f2b37a317436edceffabed6234a4768b45942138438316331218b9caf27c4f8773ee23f77876cf9d3e7cdd6496bdf257c12a4b769a90e632bb7b69367253a3b7
diff --git a/dev-haskell/thyme/metadata.xml b/dev-haskell/thyme/metadata.xml
new file mode 100644
index 000000000000..04e71262935f
--- /dev/null
+++ b/dev-haskell/thyme/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Thyme is a rewrite of the fine @time@ library, with a particular focus
+		on performance for applications that make heavy use of timestamps.
+		
+		See "Data.Thyme" for a full description.
+	</longdescription>
+	<use>
+		<flag name="bug-for-bug">bug-for-bug compatibility with time</flag>
+		<flag name="lens">use the full lens package</flag>
+		<flag name="show-internal">instance Show of internal representation</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/thyme/thyme-0.3.5.5.ebuild b/dev-haskell/thyme/thyme-0.3.5.5.ebuild
new file mode 100644
index 000000000000..7b673a14eb83
--- /dev/null
+++ b/dev-haskell/thyme/thyme-0.3.5.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -werror,-hlint
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A faster time library"
+HOMEPAGE="https://github.com/liyang/thyme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bug-for-bug lens show-internal"
+
+RESTRICT=test # optimization-dependent
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?]
+	>=dev-haskell/quickcheck-2.4:2=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-haskell/vector-space-0.8:=[profile?]
+	>=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	lens? ( >=dev-haskell/lens-3.9:=[profile?] )
+	!lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/system-posix-redirect-1.1 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bug-for-bug bug-for-bug) \
+		--flag=-hlint \
+		$(cabal_flag lens lens) \
+		$(cabal_flag show-internal show-internal) \
+		--flag=-werror
+}
diff --git a/dev-haskell/vector-space/Manifest b/dev-haskell/vector-space/Manifest
new file mode 100644
index 000000000000..9d8e36e00c27
--- /dev/null
+++ b/dev-haskell/vector-space/Manifest
@@ -0,0 +1 @@
+DIST vector-space-0.10.4.tar.gz 14249 SHA256 b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2 SHA512 c7218701fe837eab01cd65b3bc0ce2d85fb3a73c8aa034bb606b7bc0bbe87856dc5f375bd1515f65f77e08e12d84b63757d0ba755ae726771888ea7413bac183 WHIRLPOOL bd52e181afcb2744e400c810522b4d2bbba040145eebd66fd9becac1f455596ac921661f9bf4bc73b4a323b8cb32e581973524703d14431f990da8940b7c65b9
diff --git a/dev-haskell/vector-space/metadata.xml b/dev-haskell/vector-space/metadata.xml
new file mode 100644
index 000000000000..159853575fc3
--- /dev/null
+++ b/dev-haskell/vector-space/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		/vector-space/ provides classes and generic operations for vector
+		spaces and affine spaces.  It also defines a type of infinite towers
+		of generalized derivatives.  A generalized derivative is a linear
+		transformation rather than one of the common concrete representations
+		(scalars, vectors, matrices, ...).
+		
+		/Warning/: this package depends on type families working fairly well,
+		and requires ghc version at least 6.9.
+		
+		Project wiki page: &lt;http://haskell.org/haskellwiki/vector-space&gt;
+		
+		&amp;#169; 2008-2012 by Conal Elliott; BSD3 license.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/vector-space/vector-space-0.10.4.ebuild b/dev-haskell/vector-space/vector-space-0.10.4.ebuild
new file mode 100644
index 000000000000..7ad719fc6f65
--- /dev/null
+++ b/dev-haskell/vector-space/vector-space-0.10.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Vector & affine spaces, linear maps, and derivatives"
+HOMEPAGE="http://hackage.haskell.org/package/vector-space"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/boolean-0.1.0:=[profile?]
+	>=dev-haskell/memotrie-0.5:=[profile?]
+	>=dev-haskell/numinstances-1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/wavy/Manifest b/dev-haskell/wavy/Manifest
new file mode 100644
index 000000000000..20935e308307
--- /dev/null
+++ b/dev-haskell/wavy/Manifest
@@ -0,0 +1 @@
+DIST wavy-0.1.0.0.tar.gz 25100 SHA256 3849bf156ba6b2cb7f8665b66a398a175b3579534c7bc1e0f5357e7a5ad57f67 SHA512 25103aeae5104f6525b75cae4aea1b70e3998a56e4c262462a8dd7b8edfee2749fbd099e81a2c2bde0bfb0211e2194d0e4df705bd8882e526516c85be0fdd94d WHIRLPOOL 7105e0da09c621d20fc124ae32242e9c8eb0100e25c7ad0d4e8d0b78d0b5ad0cc102c392a49b9a287bc380065b1aad165a32612f2ecf5a898a30593f4f826002
diff --git a/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch b/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
new file mode 100644
index 000000000000..88db75b995c2
--- /dev/null
+++ b/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
@@ -0,0 +1,14 @@
+diff --git a/Sound/Wav/Binary.hs b/Sound/Wav/Binary.hs
+index d2c539c..11883a3 100644
+--- a/Sound/Wav/Binary.hs
++++ b/Sound/Wav/Binary.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE CPP #-}
+ -- | This module provides helper binary functions to get integer values from binary streams and put
+@@ -8,2 +9,3 @@ import Data.Int
+ 
++#if ! MIN_VERSION_binary(0,8,0)
+ getInt8 :: Get Int8
+@@ -31 +33,2 @@ putInt64le :: Int64 -> Put
+ putInt64le = putWord64le . fromIntegral
++#endif
diff --git a/dev-haskell/wavy/metadata.xml b/dev-haskell/wavy/metadata.xml
new file mode 100644
index 000000000000..da5680cdc7b3
--- /dev/null
+++ b/dev-haskell/wavy/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Wavy was designed to be a fast and efficient method of extracting and writing PCM
+		data to and from WAV files. It is here to help you make fast use of Audio
+		data in your Haskell programs and thus encourage many more audio projects in Haskell.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/wavy/wavy-0.1.0.0.ebuild b/dev-haskell/wavy/wavy-0.1.0.0.ebuild
new file mode 100644
index 000000000000..fc58013e118c
--- /dev/null
+++ b/dev-haskell/wavy/wavy-0.1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Process WAVE files in Haskell"
+HOMEPAGE="http://bitbucket.org/robertmassaioli/wavy"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/pretty-show:=[profile?]
+	>=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+PATCHES=("${FILESDIR}"/${P}-binary-0.8.patch)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'vector ==0.10.*' 'vector >= 0.10' \
+		'filepath ==1.3.*' 'filepath >= 1.3' \
+		'binary ==0.7.*' 'binary >= 0.7' \
+		'containers ==0.4.*' 'containers >= 0.4'
+}
diff --git a/dev-haskell/xmlgen/Manifest b/dev-haskell/xmlgen/Manifest
new file mode 100644
index 000000000000..bc32adb7682d
--- /dev/null
+++ b/dev-haskell/xmlgen/Manifest
@@ -0,0 +1 @@
+DIST xmlgen-0.6.2.1.tar.gz 9452 SHA256 9027a17e7ae648997a0e8279d7c01aa6615adda8b93f753b907a01dd797abae6 SHA512 c3c978859dd54cf5df970cb05f49b8b2a75a2096ef25e9a204fe665bdb3694139f69fd32f8eaef0ca047948b4c08dacae54eb67e64ac8da63cc0885022e09591 WHIRLPOOL c5a5a117af7dbfe908623dd7ea69ce050d132f79cb4c00c1e6eaefe03ef644a082652b062478f038e2a032262af38e2972d53ebfdb4553d7744013ad303acf0f
diff --git a/dev-haskell/xmlgen/metadata.xml b/dev-haskell/xmlgen/metadata.xml
new file mode 100644
index 000000000000..268865abb51e
--- /dev/null
+++ b/dev-haskell/xmlgen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Library for high-performance XML generation.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild b/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild
new file mode 100644
index 000000000000..a0698fa03392
--- /dev/null
+++ b/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast XML generation library"
+HOMEPAGE="http://hackage.haskell.org/package/xmlgen"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Cases: 8  Tried: 0  Errors: 0  Failures: 0test/1.xml: openFile: does not exist (No such file or directory)
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?]
+	>=dev-lang/ghc-6.12.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/hxt-9.3 <dev-haskell/hxt-9.4
+		>=dev-haskell/quickcheck-2.5 )
+"
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 55665645bfa9..c0185907c58e 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,2 +1,3 @@
 DIST zlib-0.5.4.1.tar.gz 127760 SHA256 cca365e4c52c90be41a5754943134da5ce6c60bb52fa00c128fd118e0505a550 SHA512 aa3522a5704978badcf634e1d99282144f01ddee4600bd146631a3ee8b98080914eb2887869a5fa404dc9d1e438a5df87cf7d44548c2f3e1ec13ba19004ef985 WHIRLPOOL 8bac920da40428c6d7c28f1f9b9284f407043b35c3dedc3677528ef622def1ad32bcd452f5046c2fc9260922cea4413e1d686fa2a1eb417e2afc8a9be5281250
 DIST zlib-0.5.4.2.tar.gz 127818 SHA256 75d617d8a77d85ba5a0d69e42c2cd5371b56140b5fb028be3e75bff1cfd41096 SHA512 9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410 WHIRLPOOL 2324166527e54480c66424385d64863ec833500415fdc9803aba9b32bc5bd09e3447f8c3babca6cbd26af46bc609b8b8f4a738dd86c43b7fef57dfc9f4f16a33
+DIST zlib-0.6.1.1.tar.gz 142902 SHA256 c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735 SHA512 b9f665308fe7887db376625d6001b5d4c511b6b0f392e366903e84f262cc7c81ed9746d9a5f0b84e9a0ec9dfdc91ed41809528dd50e067008a91ef5168cad12e WHIRLPOOL 8d0bd19f96d454cc141c425db76a1e2e7fe7b71d901309c113340b3ec3fbf205a99028c5f477509e2a68524e2970e7d7cf48d040a211880ef322f02b6288cefd
diff --git a/dev-haskell/zlib/zlib-0.6.1.1.ebuild b/dev-haskell/zlib/zlib-0.6.1.1.ebuild
new file mode 100644
index 000000000000..08c6f4a0351e
--- /dev/null
+++ b/dev-haskell/zlib/zlib-0.6.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compression and decompression in the gzip and zlib formats"
+HOMEPAGE="http://hackage.haskell.org/package/zlib"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+RESTRICT=test # needs porting to new test tools
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2
+		>=dev-haskell/tasty-0.8
+		>=dev-haskell/tasty-hunit-0.8
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 60a45ddd8d58..42f45811a7be 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -5,3 +5,4 @@ DIST crystal-0.18.7-1-linux-i686.tar.gz 14273325 SHA256 b84e9d4050b4667012bd7f59
 DIST crystal-0.18.7-1-linux-x86_64.tar.gz 13977303 SHA256 8be06d53e91d14ad05417c5504931b0ac8485a101a98711181b6a40f008f3fa8 SHA512 69366aa66f921534cb8c3f2e03555736d6e451658e0eec1038f26e74bd8ba31c61513d61d52259291431834e8bbd941d6364f329846e81bcdfb05c5d8382343c WHIRLPOOL 7cb68ab111dc5050bb92fffe7a9b243d1bd39d097c4af39d3bb43dd5ec72e1b8e393988550255605a04084afc6e0b19270003b49ff27dd948264cd8afce49291
 DIST crystal-0.18.7.tar.gz 1359375 SHA256 72b33fd4bd903a9f0957c74c2f95429e8c0f94c04df86396711b5560f540805d SHA512 4d176036d0f003cc17be73e6a0a9c5c2c9df2764123051007156d86a7dc967c93821c3e087d8c1e27fe7f7b79efa43ea0503bc902813c5b322ca12cd2212da90 WHIRLPOOL 3f7b266be386459918c2e546faf1c3989e7c285400e1f68d0af15b3a639cf72c6a08e0f821703e0413661d8080da499da22035806e0c0a6169f0dbd43792f93f
 DIST crystal-0.19.0.tar.gz 1389070 SHA256 4d7d9770891bd8bd835251e2654316412a3f44074db0adeca28357c0993eb2d8 SHA512 23c2f10f32ce1340639639f784703274a9f96799b7762289144ea0551aadd4685814ffcc781750e526ee06b5418c66ec48faeaf6d95a6e63a5e26a839918958b WHIRLPOOL d310a3a738273789856c57351e74ce99bc4eddc3e7398b3e791fdd967d46ca2edc3114f2bf34916708129184e4c1d8bc53434decdb40fb82b3d415b59a3b6fc9
+DIST crystal-0.19.1.tar.gz 1393220 SHA256 7528fc1ec63a3e9db9aabbccccfc8985511d6a54e44c5a1b26ccd0ee37275937 SHA512 6a2ab736ad65cbc435fae87d46cb235e2f3d88c7eb5b64bc1753f298deec0de4f72813d0413807002cde8acd21f183e6babe70e9f7a6f10e0cbdaaf205d964b6 WHIRLPOOL 695fb60acb728240525ec2dc1c2fd5779d398021b4a1ab0c7bcc58b360d11b6c927a0accceb84eae4c0f3f3c7251f356418fdd850721d14a290fdfbcfdad5fad
diff --git a/dev-lang/crystal/crystal-0.19.1.ebuild b/dev-lang/crystal/crystal-0.19.1.ebuild
new file mode 100644
index 000000000000..1786598fddfe
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.19.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+BV=0.18.7-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+	>=sys-devel/llvm-3.8.0
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+src_compile() {
+	emake \
+		release=1 \
+		threads=4 \
+		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="libs:${EPREFIX}/usr/$(get_libdir)/crystal"
+	use doc && emake doc
+}
+
+src_test() {
+	emake spec \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r doc/.
+	fi
+}
diff --git a/dev-lang/php/php-5.6.25.ebuild b/dev-lang/php/php-5.6.25.ebuild
index d7703b112d48..53f3a376192b 100644
--- a/dev-lang/php/php-5.6.25.ebuild
+++ b/dev-lang/php/php-5.6.25.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://php.net/"
 SRC_URI="http://php.net/distributions/${P}.tar.xz"
 LICENSE="PHP-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/python/files/python-3.4.5-cross.patch b/dev-lang/python/files/python-3.4.5-cross.patch
new file mode 100644
index 000000000000..7a016ffbd488
--- /dev/null
+++ b/dev-lang/python/files/python-3.4.5-cross.patch
@@ -0,0 +1,11 @@
+--- a/Lib/distutils/command/build_ext.py
++++ b/Lib/distutils/command/build_ext.py
+@@ -729,7 +729,7 @@
+             if sysconfig.get_config_var('Py_ENABLE_SHARED'):
+                 pythonlib = 'python{}.{}{}'.format(
+                     sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff,
+-                    sys.abiflags)
++                    sysconfig.get_config_var('ABIFLAGS'))
+                 return ext.libraries + [pythonlib]
+             else:
+                 return ext.libraries
diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
index b26c787b02e9..11359e7cb316 100644
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@@ -72,6 +72,7 @@ src_prepare() {
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
+	epatch "${FILESDIR}/${PN}-3.4.5-cross.patch"
 
 	epatch_user
 
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-build.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-build.patch
deleted file mode 100644
index 241875187941..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.6.3-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- DirectFB-1.6.3/interfaces/IDirectFBImageProvider/Makefile.am
-+++ DirectFB-1.6.3/interfaces/IDirectFBImageProvider/Makefile.am
-@@ -59,15 +59,15 @@
- MPEG2_PROVIDER =
- endif
- 
--INCLUDES = \
-+AM_CPPFLAGS =
-+AM_CPPFLAGS =  \
- 	-I$(top_builddir)/include	\
- 	-I$(top_builddir)/lib	\
- 	-I$(top_builddir)/src	\
- 	-I$(top_srcdir)/include	\
- 	-I$(top_srcdir)/lib	\
--	-I$(top_srcdir)/src
--
--AM_CPPFLAGS = -DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS)
-+	-I$(top_srcdir)/src 	\
-+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\" $(LIBJPEG_CFLAGS) $(LIBPNG_CFLAGS) $(SVG_CFLAGS)
- 
- idirectfbimageprovider_LTLIBRARIES = \
- 	libidirectfbimageprovider_dfiff.la	\
---- DirectFB-1.6.3/configure.in
-+++ DirectFB-1.6.3/configure.in
-@@ -980,7 +980,7 @@
- dnl Test for libmng
- MNG=no
- 
--AC_ARG_ENABLE(mngg,
-+AC_ARG_ENABLE(mng,
-               AC_HELP_STRING([--enable-mng],
-                              [build MNG image provider @<:@default=yes@:>@]),
-               [], [enable_mng=yes])
diff --git a/dev-libs/DirectFB/files/DirectFB-1.6.3-flags.patch b/dev-libs/DirectFB/files/DirectFB-1.6.3-flags.patch
deleted file mode 100644
index d20b05bf816f..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.6.3-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- DirectFB-1.6.3/configure.in
-+++ DirectFB-1.6.3/configure.in
-@@ -457,7 +457,7 @@
-                              [enable debugging @<:@default=no@:>@]),
-               [], [enable_debug=no])
- if test "$enable_debug" = "yes"; then
--    CFLAGS="-g3 -O0 -fno-inline -Wno-inline $CFLAGS"
-+    CFLAGS="-fno-inline -Wno-inline $CFLAGS"
-     DIRECT_BUILD_DEBUG=1
- else
-     DIRECT_BUILD_DEBUG=0
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.1-flags.patch b/dev-libs/DirectFB/files/DirectFB-1.7.1-flags.patch
deleted file mode 100644
index 65221755cb01..000000000000
--- a/dev-libs/DirectFB/files/DirectFB-1.7.1-flags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Dec 28 23:48:53 2013 +0100
-
-    * respect system flags
-    * remove Werror, it breaks the build
-
---- a/configure.in
-+++ b/configure.in
-@@ -194,12 +194,7 @@ AM_CONDITIONAL(X11VDPAU_CORE, test "$enable_x11vdpau" = "yes")
- AC_CHECK_HEADERS(linux/compiler.h linux/unistd.h asm/page.h signal.h)
- 
- 
--dnl Clear default CFLAGS
--if test x"$CFLAGS" = x"-g -O2"; then
--  CFLAGS=
--fi
--
--CFLAGS="-ffast-math -pipe $CFLAGS"
-+CFLAGS="-ffast-math $CFLAGS"
- 
- DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS"
- 
-@@ -467,7 +462,7 @@ AC_ARG_ENABLE(debug,
-                              [enable debugging @<:@default=no@:>@]),
-               [], [enable_debug=no])
- if test "$enable_debug" = "yes"; then
--    CFLAGS="-g3 -O0 -fno-inline -Wno-inline $CFLAGS"
-+    CFLAGS="-fno-inline -Wno-inline $CFLAGS"
-     DIRECT_BUILD_DEBUG=1
- else
-     DIRECT_BUILD_DEBUG=0
-@@ -483,13 +478,8 @@ AC_ARG_ENABLE(debug-support,
-               [], [enable_debug_support=yes])
- if test "$enable_debug_support" = "yes" || test "$enable_debug" = "yes"; then
-     enable_debug_support=yes
--    if test "$enable_debug" = "no"; then
--        CFLAGS="-g2 $CFLAGS"
--    fi
--    CFLAGS="-O3 $CFLAGS"
-     DIRECT_BUILD_DEBUGS=1
- else
--    CFLAGS="-O3 -g0 $CFLAGS"
-     DIRECT_BUILD_DEBUGS=0
- fi
- AM_CONDITIONAL(ENABLE_DEBUGS, test "$enable_debug_support" = "yes")
-@@ -2750,8 +2750,6 @@
- 
- AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
- 
--CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
--
- AC_ARG_ENABLE(extra-warnings,
-               AC_HELP_STRING([--enable-extra-warnings],
-                              [enable extra warnings @<:@default=no@:>@]),
-@@ -2761,7 +2759,7 @@
- fi
- 
- if test "$GCC" = "yes"; then
--  CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing -Werror-implicit-function-declaration $CFLAGS"
-+  CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-strict-aliasing $CFLAGS"
-   CXXFLAGS="-Wall -Wno-strict-aliasing $CXXFLAGS"
- fi
- 
diff --git a/dev-libs/OpenSRF/files/OpenSRF-1.0.7-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-1.0.7-buildfix.patch
deleted file mode 100644
index 1b753d36d347..000000000000
--- a/dev-libs/OpenSRF/files/OpenSRF-1.0.7-buildfix.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -Nuar OpenSRF-1.0.7.orig/bin/osrf_ctl.sh OpenSRF-1.0.7/bin/osrf_ctl.sh
---- OpenSRF-1.0.7.orig/bin/osrf_ctl.sh	2009-06-11 13:12:13.000000000 +0000
-+++ OpenSRF-1.0.7/bin/osrf_ctl.sh	2009-11-10 08:20:37.233637281 +0000
-@@ -87,8 +87,9 @@
- 	esac;
- done
- 
--OSRF_CONFIG=`which osrf_config`
--[ -z "$OSRF_CONFIG" ] && OSRF_CONFIG=`find $BASEDIR -name osrf_config`
-+#OSRF_CONFIG=`which osrf_config`
-+#[ -z "$OSRF_CONFIG" ] && OSRF_CONFIG=`find $BASEDIR -name osrf_config`
-+OSRF_CONFIG=/usr/bin/osrf_config
- 
- [ -z "$OPT_CONFIG" ] && OPT_CONFIG=`$OSRF_CONFIG --sysconfdir`/opensrf_core.xml;
- if [ ! -r "$OPT_CONFIG" ]; then
-diff -Nuar OpenSRF-1.0.7.orig/Makefile.am OpenSRF-1.0.7/Makefile.am
---- OpenSRF-1.0.7.orig/Makefile.am	2008-10-27 05:10:21.000000000 +0000
-+++ OpenSRF-1.0.7/Makefile.am	2009-11-10 08:19:16.190311593 +0000
-@@ -115,14 +115,14 @@
- SUBDIRS = src
- 
- jserver:
--	make -s -C src jserver
-+	$(MAKE) -s -C src jserver
- 
- jserver-install:
--	make -s -C src jserver-install
-+	$(MAKE) -s -C src jserver-install
- 
- javascript-install:
--	make -s -C src javascript-install
-+	$(MAKE) -s -C src javascript-install
- 
- install-data-hook:
--	cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h
-+	cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h
- 
-diff -Nuar OpenSRF-1.0.7.orig/src/gateway/Makefile.am OpenSRF-1.0.7/src/gateway/Makefile.am
---- OpenSRF-1.0.7.orig/src/gateway/Makefile.am	2008-08-18 19:14:00.000000000 +0000
-+++ OpenSRF-1.0.7/src/gateway/Makefile.am	2009-11-10 08:19:15.250311793 +0000
-@@ -16,16 +16,25 @@
- 
- AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
- AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
-+APACHE_DEPS = apachetools.c apachetools.h
-+LIBS=libopensrf.so
-+TARGETS = osrf_json_gateway.la osrf_http_translator.la
- 
--install-exec-local: 
--	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
--		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
--		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
--	fi
--	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
--	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
--	$(APXS2) -i -a @srcdir@/osrf_json_gateway.la
--	$(APXS2) -i -a @srcdir@/osrf_http_translator.la
-+all: $(TARGETS)
-+
-+osrf_json_gateway.la: osrf_json_gateway.c $(APACHE_DEPS)
-+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS)
-+	
-+osrf_http_translator.la: osrf_http_translator.c $(APACHE_DEPS)
-+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS)
-+
-+#install-exec-local:  $(TARGETS)
-+#	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
-+#		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-+#		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
-+#	fi
-+#	$(APXS2) -i -a osrf_json_gateway.la
-+#	$(APXS2) -i -a osrf_http_translator.la
- 
- clean-local:
- 	rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo
-diff -Nuar OpenSRF-1.0.7.orig/src/java/Makefile.am OpenSRF-1.0.7/src/java/Makefile.am
---- OpenSRF-1.0.7.orig/src/java/Makefile.am	2008-07-17 18:15:09.000000000 +0000
-+++ OpenSRF-1.0.7/src/java/Makefile.am	2009-11-10 08:19:15.250311793 +0000
-@@ -48,8 +48,8 @@
- 	rm files;
- 
- install-data-local:
--	mkdir -p $(LIBDIR)/java
--	cp opensrf.jar $(LIBDIR)/java
-+	mkdir -p $(DESTDIR)$(LIBDIR)/java
-+	cp opensrf.jar $(DESTDIR)$(LIBDIR)/java
- 
- dep_clean:
- 	rm -rf deps
-diff -Nuar OpenSRF-1.0.7.orig/src/libopensrf/Makefile.am OpenSRF-1.0.7/src/libopensrf/Makefile.am
---- OpenSRF-1.0.7.orig/src/libopensrf/Makefile.am	2008-08-07 16:54:56.000000000 +0000
-+++ OpenSRF-1.0.7/src/libopensrf/Makefile.am	2009-11-10 08:19:16.190311593 +0000
-@@ -94,6 +94,7 @@
- opensrf_c_SOURCES = opensrf.c
- opensrf_c_DEPENDENCIES = libopensrf.la
- 
-+osrf_json_test_DEPENDENCIES = libopensrf.la libosrf_json.la
- osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS)
- 
- noinst_LTLIBRARIES = libosrf_json.la
-diff -Nuar OpenSRF-1.0.7.orig/src/Makefile.am OpenSRF-1.0.7/src/Makefile.am
---- OpenSRF-1.0.7.orig/src/Makefile.am	2008-11-04 03:04:24.000000000 +0000
-+++ OpenSRF-1.0.7/src/Makefile.am	2009-11-10 08:19:16.190311593 +0000
-@@ -17,7 +17,7 @@
- export OPENSRF	= opensrf
- export BINDIR	= @bindir@
- export LIBDIR	= @libdir@
--jsdir = $(LIBDIR)/javascript
-+jsdir = $(datarootdir)/opensrf/javascript
- export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@
- etcdir = $(ETCDIR)
-
-@@ -41,12 +41,12 @@
- dist_sysconf_DATA = @top_srcdir@/examples/opensrf.xml.example @top_srcdir@/examples/opensrf_core.xml.example @top_srcdir@/examples/srfsh.xml.example 
- 
- install-exec-local:
--	mkdir -p $(VAR)
--	mkdir -p $(PID)
--	mkdir -p $(LOG)
--	mkdir -p $(SOCK)
--	mkdir -p $(jsdir)
--	make install-perl
-+	mkdir -p $(DESTDIR)$(VAR)
-+	mkdir -p $(DESTDIR)$(PID)
-+	mkdir -p $(DESTDIR)$(LOG)
-+	mkdir -p $(DESTDIR)$(SOCK)
-+	mkdir -p $(DESTDIR)$(jsdir)
-+#	$(MAKE) install-perl
- 
- install-exec-hook:
- 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example'
-@@ -55,14 +55,14 @@
- 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example'
- 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
- 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
--	cp -r @srcdir@/javascript/* $(jsdir)/
-+	cp -r @srcdir@/javascript/* $(DESTDIR)$(jsdir)/
- 
- 
- install-perl:
--	cd ./perl && perl Makefile.PL || make -s install-perl-fail
--	make -C perl
--	make -C perl test || make -s install-perl-fail
--	make -C perl install
-+#	cd ./perl && perl Makefile.PL || $(MAKE) -s install-perl-fail
-+#	$(MAKE) -C perl
-+#	$(MAKE) -C perl test || $(MAKE) -s install-perl-fail
-+#	$(MAKE) -C perl install
- 
- install-perl-fail:
- 	echo
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index d05007d7fa3f..5821bd77e1e8 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -2,3 +2,4 @@ DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d
 DIST appstream-glib-0.5.15.tar.xz 1884660 SHA256 cc21f213f4aa1693e68b9edf3b79933ef510c936bf9a8ff6e5edfc1ce15b5b3e SHA512 038dcabc48c868d0d1f6fa0841a465970fd28811c910dde3020beb641ffc89f2a6567d5b16cbf2c9e3100d71b39bc2a2584a2fbe502b77b74c8ad8cb4c0067da WHIRLPOOL 754330dd9ef5450781f978a880ed08d3c98248d2ad79f3c0c693addc1c8453348df4018d12bdca9a99b404fa1336994de12c89c29567928fdce9fc578afb88bb
 DIST appstream-glib-0.5.16.tar.xz 1885896 SHA256 788de3f6480789ad1adc144b0e16978af5863365b7a1650b4f14d29ad848ec62 SHA512 c047d2f6a3cb46ebbcd4dd6165bcbfbaba6d0b20b45d94b933b36cfd62f8821c0e062c4932d0d9d846cdb866bddd611a1055baf21d9438b1fa50b8480ecd7c17 WHIRLPOOL b09d0335a28b138dac58d70257773c2f653808c53c6ea2c923f94612a8a86147e793b36194716a3e58897bff5d9c9d1b677244044020236391d63e05e1be19e5
 DIST appstream-glib-0.5.9.tar.xz 1868132 SHA256 f0e4818553fe763894c660fec2c461b8815f83869acbf165daf32e2e41a5b166 SHA512 3c39233df97c464bfc993b54cee7eea01407220de39f833e34a017f6efc4c9bad0eb1762d72aed5eee94bb6a66044c7e031ede6685e1804b7ad6833b12fa9f7b WHIRLPOOL bbcc4318fafb1c3d94a8d695b924d2dec6f8c1bc968de3ca1480a8db6df47b7f30d2b656be09d7b6c2d7ed919b943452eca5b35e4559ff869872e97374228234
+DIST appstream-glib-0.6.3.tar.xz 1944512 SHA256 3ec355c950b86cd792b6e396a5a4a72487999e300fcacf7466a663974ec4ad24 SHA512 aae4885e32bc6f0247f6e8f415471531a8c28976e1ba4bd977200d72e24a04dfc2370395e3e0ea6e052386a963540cb91f025cd4f1ab837404762f1be2a76ff0 WHIRLPOOL 5bc9874e9f0708064f93fca8938d3708171dbf4cd356c8475e6d804ba109e51fc0b00d5dc4ac547f55c8a37c358c0d8fad6900ea214e8760b6da999be3f8c252
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild
new file mode 100644
index 000000000000..d638ac2df66a
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection nls stemmer"
+
+RDEPEND="
+	app-arch/gcab
+	app-arch/libarchive
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.45.8:2
+	>=dev-libs/json-glib-1.1.1
+	dev-libs/libyaml
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.4:2
+	>=net-libs/libsoup-2.51.92:2.4
+	sys-apps/util-linux
+	>=x11-libs/gdk-pixbuf-2.31.5:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=sys-devel/gettext-0.19.7
+"
+# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
+# are migrated to appstream-glib
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-builder \
+		--enable-firmware \
+		--disable-rpm \
+		--disable-static \
+		--enable-dep11 \
+		--enable-man \
+		$(use_enable nls) \
+		$(use_enable introspection) \
+		$(use_enable stemmer) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
diff --git a/dev-libs/appstream-glib/metadata.xml b/dev-libs/appstream-glib/metadata.xml
index 39980802b1da..03dc146005b4 100644
--- a/dev-libs/appstream-glib/metadata.xml
+++ b/dev-libs/appstream-glib/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<use>
+	<flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>	
+</use>
 </pkgmetadata>
diff --git a/dev-libs/expat/expat-2.1.1-r1.ebuild b/dev-libs/expat/expat-2.1.1-r1.ebuild
deleted file mode 100644
index b1dcb11f85ac..000000000000
--- a/dev-libs/expat/expat-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils libtool multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Stream-oriented XML parser library"
-HOMEPAGE="http://expat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=583268
-	epatch "${FILESDIR}"/${P}-CVE-2015-1283-refix.patch
-	epatch "${FILESDIR}"/${P}-CVE-2016-0718-v2-2-1.patch
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable static-libs static)"
-
-	mkdir -p "${BUILD_DIR}"{u,w} || die
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"u >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-
-		pushd "${BUILD_DIR}"w >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"u >/dev/null
-		emake buildlib LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake buildlib LIBRARY=libexpatw.la
-		popd >/dev/null
-	fi
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use unicode; then
-		pushd "${BUILD_DIR}"u >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${BUILD_DIR}"w >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatu.pc
-		sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-
-	if multilib_is_native_abi ; then
-		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-		use elibc_FreeBSD && gen_usr_ldscript -a expat
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changes README
-	dohtml doc/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	prune_libtool_files
-}
diff --git a/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch b/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch
deleted file mode 100644
index 366bd4f32b54..000000000000
--- a/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-
-# HG changeset patch
-# User Eric Rahm <erahm@mozilla.com>
-# Date 1428706223 25200
-# Node ID 438d9e2a991ab82381a1a1442a470b2565c80c13
-# Parent  1c0861d7a6457f461cccccb2e0895a9f9d34c8d4
-Bug 1140537 - Sanity check size calculations. r=peterv
-
-diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
---- a/parser/expat/lib/xmlparse.c
-+++ b/parser/expat/lib/xmlparse.c
-@@ -1648,29 +1648,40 @@ XML_ParseBuffer(XML_Parser parser, int l
-   XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
-   positionPtr = bufferPtr;
-   return result;
- }
- 
- void * XMLCALL
- XML_GetBuffer(XML_Parser parser, int len)
- {
-+/* BEGIN MOZILLA CHANGE (sanity check len) */
-+  if (len < 0) {
-+    errorCode = XML_ERROR_NO_MEMORY;
-+    return NULL;
-+  }
-+/* END MOZILLA CHANGE */
-   switch (ps_parsing) {
-   case XML_SUSPENDED:
-     errorCode = XML_ERROR_SUSPENDED;
-     return NULL;
-   case XML_FINISHED:
-     errorCode = XML_ERROR_FINISHED;
-     return NULL;
-   default: ;
-   }
- 
-   if (len > bufferLim - bufferEnd) {
--    /* FIXME avoid integer overflow */
-     int neededSize = len + (int)(bufferEnd - bufferPtr);
-+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
-+    if (neededSize < 0) {
-+      errorCode = XML_ERROR_NO_MEMORY;
-+      return NULL;
-+    }
-+/* END MOZILLA CHANGE */
- #ifdef XML_CONTEXT_BYTES
-     int keep = (int)(bufferPtr - buffer);
- 
-     if (keep > XML_CONTEXT_BYTES)
-       keep = XML_CONTEXT_BYTES;
-     neededSize += keep;
- #endif  /* defined XML_CONTEXT_BYTES */
-     if (neededSize  <= bufferLim - buffer) {
-@@ -1689,17 +1700,25 @@ XML_GetBuffer(XML_Parser parser, int len
-     }
-     else {
-       char *newBuf;
-       int bufferSize = (int)(bufferLim - bufferPtr);
-       if (bufferSize == 0)
-         bufferSize = INIT_BUFFER_SIZE;
-       do {
-         bufferSize *= 2;
--      } while (bufferSize < neededSize);
-+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
-+      } while (bufferSize < neededSize && bufferSize > 0);
-+/* END MOZILLA CHANGE */
-+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
-+      if (bufferSize <= 0) {
-+        errorCode = XML_ERROR_NO_MEMORY;
-+        return NULL;
-+      }
-+/* END MOZILLA CHANGE */
-       newBuf = (char *)MALLOC(bufferSize);
-       if (newBuf == 0) {
-         errorCode = XML_ERROR_NO_MEMORY;
-         return NULL;
-       }
-       bufferLim = newBuf + bufferSize;
- #ifdef XML_CONTEXT_BYTES
-       if (bufferPtr) {
-
diff --git a/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch b/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch
deleted file mode 100644
index 5ac5d54eba18..000000000000
--- a/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix "xmlwf -h" output
-
-Patch is from: http://pkgs.fedoraproject.org/cgit/expat.git/plain/expat-2.1.0-xmlwfargs.patch
-
---- xmlwf/xmlwf.c
-+++ xmlwf/xmlwf.c
-@@ -634,7 +634,7 @@ static void
- usage(const XML_Char *prog, int rc)
- {
-   ftprintf(stderr,
--           T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] "
-+           T("usage: %s [-s] [-n] [-p] [-x] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [-v] "
-              "[-e encoding] file ...\n"), prog);
-   exit(rc);
- }
diff --git a/dev-libs/icu/files/icu-flagparser.patch b/dev-libs/icu/files/icu-flagparser.patch
deleted file mode 100644
index bd642762a0f3..000000000000
--- a/dev-libs/icu/files/icu-flagparser.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: source/tools/toolutil/flagparser.c
-===================================================================
---- a/source/tools/toolutil/flagparser.c	(revision 38080)
-+++ b/source/tools/toolutil/flagparser.c	(revision 38081)
-@@ -97,7 +97,7 @@
- 
-     T_FileStream_close(f);
-     
--    if (U_FAILURE(*status)) {
-+    if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
-         return -1;
-     }
- 
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 14d3f4dd9aca..8ed39e7a5ce3 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -2,3 +2,4 @@ DIST libgit2-glib-0.22.8.tar.xz 429300 SHA256 05c9453b195f1af0df2a5d8bc71472c9fb
 DIST libgit2-glib-0.23.10.tar.xz 450552 SHA256 398ea6ff5fb1eafa61f2908da5ff8722dc051a2081be6cbed76a2ab07ecab1af SHA512 bf85ca562bb1e00fb65d499d133daaa9deeb8abe37e1caa33148c469e91f43f685c222fe976985b4a5e9cef4ebaec9e92d90d5a87287f0c6012f798ed9755a07 WHIRLPOOL 91d55e52c507a80d28f110f7feb183dd046db4389732ff4a68996156ef2a04e956c71ef485c36c9b8f945208f699bed883d5c914eb8e53db1301c7e9b59eb1f1
 DIST libgit2-glib-0.24.0.tar.xz 456724 SHA256 d616c268821c28ff8dc1a6419dbf8555fa48e31dc6509c10f5151be7690f4845 SHA512 d613fc1aa17543500c448a6d0d90f7e0c17bacd1cced4a9d7a126fb1ebf96981fe9613b96cea397e7cfe46c2bb17b4c9de0535e5985f682bcb388fe5dd4dcc0a WHIRLPOOL f827845587794904d603527d82d6b10ae226e9e4709695b2e00cb1b640eb1d34c7751e5e5d78d59d694cf9696c4cd95bcc246e346524d114f846ae836d2ce987
 DIST libgit2-glib-0.24.3.tar.xz 458316 SHA256 0c4f781d293a57758a81d67e22964e78389f7a4e860ac37c86788a763a625969 SHA512 ae21e2b56cd65838af820c17c0a041bb5517ea38f38eb0674fa5643e926f7f06547f58644cb9d28db39735ac975ade0b6f4e24d3cd2e98731168729c0470b49d WHIRLPOOL 8932846c68829df8189b9f74e5462e7559eb09edd4f7ddcab213ab9b1e9e0219a8b59f82be8c3d9c2fe3bfae568523c08e3331308b851d8cc736db2dfc172e83
+DIST libgit2-glib-0.24.4.tar.xz 458360 SHA256 3a211f756f250042f352b3070e7314a048c88e785dba9d118b851253a7c60220 SHA512 55874f77ded1474eab6f84d3426c8cddd56a42b04b8b3e50e4294f396b8c10025a38bc925c0b74ba3e52022c696f07e7f69b75c443bbd0af0f9e0769b7c4555f WHIRLPOOL 22a17e940a670ccb31cf0fc229b8f042794e10e7c5996d4059779d3a7b2ab5865b9cf1bc1a32a9297e88e5b069b281e7f20b2db636f91d5f8af9df8f14d23346
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.24.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.24.4.ebuild
new file mode 100644
index 000000000000..0bc09edc7209
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.24.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="python ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
+# of changing their API in each release in ways that break libgit2-glib
+RDEPEND="
+	>=dev-libs/libgit2-0.24.0:0/24[ssh?]
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/gobject-introspection-0.10.1:=
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python ; then
+		install_gi_override() {
+			python_moduleinto "$(python_get_sitedir)/gi/overrides"
+			python_domodule "${S}"/${PN}/Ggit.py
+		}
+		python_foreach_impl install_gi_override
+	fi
+}
diff --git a/dev-libs/libgudev/libgudev-230-r1.ebuild b/dev-libs/libgudev/libgudev-230-r1.ebuild
new file mode 100644
index 000000000000..0ca626e50d35
--- /dev/null
+++ b/dev-libs/libgudev/libgudev-230-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GObject bindings for libudev"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
+
+LICENSE="LGPL-2.1"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="introspection static-libs"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.22.0:2=[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-fs/eudev[gudev(-)]
+	!sys-fs/udev[gudev(-)]
+	!sys-apps/systemd[gudev(-)]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-libs/libmateweather/files/libmateweather-1.5.0-fix-automagic-python-support.patch b/dev-libs/libmateweather/files/libmateweather-1.5.0-fix-automagic-python-support.patch
deleted file mode 100644
index de5f44a2c0fd..000000000000
--- a/dev-libs/libmateweather/files/libmateweather-1.5.0-fix-automagic-python-support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -burN libmateweather-1.5.1.orig/configure.ac libmateweather-1.5.1/configure.ac
---- libmateweather-1.5.1.orig/configure.ac	2013-02-04 15:53:55.420890494 +0100
-+++ libmateweather-1.5.1/configure.ac	2013-02-04 15:55:19.618967277 +0100
-@@ -215,7 +215,7 @@
- AC_ARG_ENABLE(python,
-         [AC_HELP_STRING([--enable-python],
-                         [Build libmateweather python bindings])],
--        [enable_python=yes],
-+        [enable_python=$enableval],
-         [enable_python=no])
- if test "$enable_python" = "yes"; then
-    AM_PATH_PYTHON()
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 222054cb665e..99d01d2e8f85 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,3 +1,2 @@
-DIST link-grammar-4.8.6.tar.gz 2879287 SHA256 6a63bf84e487876bc15311844fdb4d482b2f9d01f3c1d52d45cc7ff6beacc893 SHA512 70e1a605b295f6f49e707c701a2fd1bb1905b7d34b950bbf9b3f6fa70c289f1d40c7791ba755b50cfeb847a5dc634239fd58c7933f716f378fce2bfda62b0535 WHIRLPOOL 75ed2446f4243e3623eecf9fcfb22146d48e0df260aea5fb77a7035f7eeab0ee9a214110dfd15be4858bf04a7a83b129066197e32949acfba6e726d4eddf8762
-DIST link-grammar-5.3.3.tar.gz 4093300 SHA256 99bdec507a84079cd1d26b0f94dbca0bab7c0888073fe68d682febaf67746a79 SHA512 da4c3ac4fb3e0baf2c3d4654aad91ae92d4759c4ea66fe01c9ca84107d171e542a42c4bd508e7cc6be293116c02528042e79b2aefa5a80b253f6ac792110f714 WHIRLPOOL 073319778e8876c0ea97ab8c68923f543b95c8fdf58ae4b0a42126fe589396414ad1f279c49903f2bb70f0a7fdfddb382f256e49b00036ec3795cfb62683652d
 DIST link-grammar-5.3.7.tar.gz 3555475 SHA256 d0cf0061cccccfdc7c539e1f402da11b5fe2783940546560cd11a05382263a6a SHA512 f1a1e03841f847d427acb24cfb7a7a552ade6731253cf5f2ce6fcb82be387426d7cb5b47a82523f01fc56771c0667881ae663380dbc644e775694029c7fef740 WHIRLPOOL 86bf7f2e26a6e3e5c560c85719d2a8823846ad1d4a273641104111bff2523c431f459a38415c22c12db61dc344ac99e8dd33dcb7210ee42d5517f39c1e0ff90f
+DIST link-grammar-5.3.9.tar.gz 3597250 SHA256 fa0a9957607705a42dbfa6bddae6567fdd11c0f648157dc824bb6facf873156a SHA512 1fa7c36c53c0525e774239fd3d9c6159ae6416b0ca3d1a4d6883c77443132fed22d13d367f26dc335b75e40ecdb163e0057d1cd1f76ffa92c7f7cbd18f31266f WHIRLPOOL 8954f0d285e9b1b045781a2cf40d401dfafb51a3f7506251d4542509d260f7f501375f9a9b036359717e7b3d0a90d5a78cd02df947bc7d9027eff274caacf61b
diff --git a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
new file mode 100644
index 000000000000..6eacc6610f90
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
@@ -0,0 +1,61 @@
+--- a/bindings/python/Makefile.am	2016-08-26 04:28:48.000000000 +0200
++++ b/bindings/python/Makefile.am	2016-09-10 16:13:33.554781694 +0200
+@@ -4,9 +4,8 @@
+ # Created by Linas Vepstas February 2014
+ #
+ 
+-SWIG_SOURCES = ../swig/link_grammar.i
+-# BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
+-BUILT_C_SOURCES = ../../bindings/python/lg_python_wrap.cc
++SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
++BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
+ BUILT_PY_SOURCES = $(top_builddir)/bindings/python/clinkgrammar.py
+ 
+ # Over-ride the install location, so as to remove the dash in the
+@@ -20,7 +19,7 @@
+ pkgpython_PYTHON =                                 \
+-   linkgrammar.py                                  \
++   $(srcdir)/linkgrammar.py                                  \
+    $(top_builddir)/bindings/python/__init__.py     \
+-   $(top_builddir)/bindings/python/clinkgrammar.py
++   $(BUILT_PY_SOURCES)
+ 
+ 
+ # These are packaged in the tarball; make clean should not remove them.
+--- a/bindings/python3/Makefile.am	2016-08-26 04:28:48.000000000 +0200
++++ b/bindings/python3/Makefile.am	2016-09-11 01:30:35.700926275 +0200
+@@ -4,9 +4,8 @@
+ # Created by Linas Vepstas February 2014
+ #
+ 
+-SWIG_SOURCES = ../swig/link_grammar.i
+-# BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
+-BUILT_C_SOURCES = ../../bindings/python3/lg_python_wrap.cc
++SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
++BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
+ BUILT_PY_SOURCES = $(top_builddir)/bindings/python3/clinkgrammar.py
+ 
+ # Over-ride the install location, so as to remove the dash in the
+@@ -18,9 +17,9 @@
+ 
+ # Files that get installed in $pkgpythondir
+ pkgpython3_PYTHON =                                 \
+-   ../../bindings/python/linkgrammar.py             \
++   $(top_srcdir)/bindings/python/linkgrammar.py     \
+    $(top_builddir)/bindings/python3/__init__.py     \
+-   $(top_builddir)/bindings/python3/clinkgrammar.py
++   $(BUILT_PY_SOURCES)
+ 
+ 
+ # Apparently, anaconda does not work without this!?
+--- a/bindings/python3/Makefile.am	2016-09-11 12:44:01.466971878 +0200
++++ b/bindings/python3/Makefile.am	2016-09-11 12:44:22.385788941 +0200
+@@ -26,7 +26,7 @@
+ # This seems wrong and lme to me, but see issue #298
+ pkgpypathdir=$(pythondir)
+ pkgpypath_PYTHON =                                 \
+-   linkgrammar.pth
++   $(srcdir)/linkgrammar.pth
+ 
+ # These are packaged in the tarball; make clean should not remove them.
+ maintainer-clean-local:
diff --git a/dev-libs/link-grammar/link-grammar-4.8.6.ebuild b/dev-libs/link-grammar/link-grammar-4.8.6.ebuild
deleted file mode 100644
index 008a79d5b263..000000000000
--- a/dev-libs/link-grammar/link-grammar-4.8.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit gnome2 java-pkg-opt-2 eutils
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Set the same default as used in app-text/enchant
-IUSE="aspell +hunspell java static-libs threads"
-
-DEPEND="
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	java? ( >=virtual/jdk-1.5
-		dev-java/ant-core )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only aspell will be build. Press Ctrl+C and set only 'hunspell' USE flag if"
-		ewarn "you want hunspell support."
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	use hunspell && myconf="${myconf} --with-hunspell-dictdir=/usr/share/myspell"
-	gnome2_src_configure \
-		--enable-shared \
-		$(use_enable aspell) \
-		$(use_enable hunspell) \
-		$(use_enable java java-bindings) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthreads) \
-		${myconf}
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild b/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild
deleted file mode 100644
index 50dcbac8e3bd..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils gnome2 java-pkg-opt-2 python-any-r1
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
-SRC_URI="https://github.com/opencog/${PN}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="aspell +hunspell java python static-libs threads"
-
-RDEPEND="
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	java? (
-		>=virtual/jdk-1.6:*
-		dev-java/ant-core )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-pkg_setup() {
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
-		ewarn "you want aspell support."
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-	AT_M4DIR="ac-helpers/" eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-perl-bindings \
-		--enable-shared \
-		$(use_enable aspell) \
-		$(use_enable hunspell) \
-		$(usex hunspell --with-hunspell-dictdir=/usr/share/myspell) \
-		$(use_enable java java-bindings) \
-		$(use_enable python python-bindings) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthreads)
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-	gnome2_pkg_preinst
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.3.9.ebuild b/dev-libs/link-grammar/link-grammar-5.3.9.ebuild
new file mode 100644
index 000000000000..96fadd6e4bce
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-5.3.9.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
+
+DESCRIPTION="A Syntactic English parser"
+HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="aspell +hunspell java python static-libs threads"
+
+RDEPEND="
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+	java? (
+		>=virtual/jdk-1.6:*
+		dev-java/ant-core )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
+NORMAL_BUILD_DIR="${WORKDIR}/${P}-normal"
+
+pkg_setup() {
+	if use aspell && use hunspell; then
+		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
+		ewarn "you want aspell support."
+	fi
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	eapply "${FILESDIR}"/${P}-out-of-source-build.patch
+	eautoreconf
+
+	if use python ; then
+		prepare_python() {
+			mkdir -p "${BUILD_DIR}" || die
+		}
+		python_foreach_impl prepare_python
+	fi
+
+	mkdir -p "${NORMAL_BUILD_DIR}" || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-editline
+		--disable-perl-bindings
+		--enable-shared
+		$(use_enable aspell)
+		$(use_enable hunspell)
+		$(usex hunspell --with-hunspell-dictdir=/usr/share/myspell)
+		$(use_enable java java-bindings)
+		$(use_enable static-libs static)
+		$(use_enable threads pthreads)
+	)
+
+	cd "${NORMAL_BUILD_DIR}" || die
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		--disable-python-bindings \
+		--disable-python3-bindings \
+		${myconf[@]}
+
+	if use python ; then
+		prepare_python() {
+			if python_is_python3; then
+				ECONF_SOURCE="${S}" gnome2_src_configure \
+					--disable-python-bindings \
+					--enable-python3-bindings \
+					${myconf[@]}
+			else
+				ECONF_SOURCE="${S}" gnome2_src_configure \
+					--enable-python-bindings \
+					--disable-python3-bindings \
+					${myconf[@]}
+			fi
+		}
+		python_foreach_impl run_in_build_dir prepare_python
+	fi
+}
+
+src_compile() {
+	cd "${NORMAL_BUILD_DIR}" || die
+	gnome2_src_compile
+
+	if use python ; then
+		compile_binding() {
+			local pysuffix
+			if python_is_python3; then
+				pysuffix=3
+			else
+				pysuffix=
+			fi
+
+			emake -C bindings/python$pysuffix \
+				VPATH="${S}:${NORMAL_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la
+		}
+		python_foreach_impl run_in_build_dir compile_binding
+	fi
+}
+
+src_test() {
+	cd "${NORMAL_BUILD_DIR}" || die
+	ln -s "${S}"/data tests/data || die
+	emake check
+}
+
+src_install() {
+	cd "${NORMAL_BUILD_DIR}" || die
+	gnome2_src_install
+
+	if use python ; then
+		install_binding() {
+			local pysuffix
+			if python_is_python3; then
+				pysuffix=3
+			else
+				pysuffix=
+			fi
+
+			emake -C bindings/python$pysuffix \
+				VPATH="${S}:${NORMAL_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl run_in_build_dir install_binding
+	fi
+}
+
+pkg_preinst() {
+	use java && java-pkg-opt-2_pkg_preinst
+	gnome2_pkg_preinst
+}
diff --git a/dev-libs/vrb/Manifest b/dev-libs/vrb/Manifest
index 51066fcf98d6..61c7c38aa57d 100644
--- a/dev-libs/vrb/Manifest
+++ b/dev-libs/vrb/Manifest
@@ -1,2 +1 @@
-DIST vrb-0.3.0.tar.gz 30228 SHA256 982a7b0c49db88b61a2ebd7fd442d691548a5ab7e3cacd90431a045c314ed99c SHA512 7a79497a1497afb72c02c404fe628042bfc39ded06ec92d6d835948aaa3d9ee7a595e3e0a379515d2ebb498422f9a9c493853a75831180892e8e9070d6bb2f95 WHIRLPOOL 62cdac11c824b93627061c23c20cc88e040a36a646c8e305ed7647f0584a1cc1d33ed660a9e9447ec6e3737a60ef579c2e0fe3fa1c120018f32524cbd9b2c0a5
 DIST vrb-0.5.1.tar.bz2 41106 SHA256 d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f SHA512 0db418e659d4c7cfc38ed5774345d204a87ca72525ea1d86e15ee3a09ff66828df1c110e2c84336fc8789a94b3e05eda1a2c4881799e511a7f75b728e2bc0734 WHIRLPOOL 2033b40a2875dc374ba82188cb8ec98f1bfd26eaa2ed151f561537868f696bc7b509c8388f1ce6802b9a9ef4b689041a4d6391248363a1f7f672e6b9a3c25df4
diff --git a/dev-libs/vrb/vrb-0.3.0.ebuild b/dev-libs/vrb/vrb-0.3.0.ebuild
deleted file mode 100644
index 8144ba00d007..000000000000
--- a/dev-libs/vrb/vrb-0.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="library for a virtual ring buffer"
-HOMEPAGE="http://phil.ipal.org/freeware/vrb/"
-SRC_URI="http://phil.ipal.org/freeware/vrb/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_compile() {
-	#respecting CFLAGS and LDFLAGS
-	sed -i "s/copts=\"-pipe -O2\"/copts=\"${CFLAGS} ${LDFLAGS}\"/g" Configure
-	sed -i "s/gcc -v/\${CC} \${COPTS}/g" Configure
-
-	#respecting CC
-	sed -i "s/gcc/\${CC}/g" Configure
-
-	#omiting -Werror
-	sed -i "s/-Werror//g" Configure
-
-	CC="$(tc-getCC)" ./Configure 						\
-		--prefix=/usr || die "./Configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /usr/include/libvrb/
-	doins include/vrb.h
-
-	dolib.so lib/libvrb.so.0.3.0
-
-	dosym libvrb.so.0.3.0 /usr/$(get_libdir)/libvrb.so.0.3
-	dosym libvrb.so.0.3.0 /usr/$(get_libdir)/libvrb.so.0
-	dosym libvrb.so.0.3.0 /usr/$(get_libdir)/libvrb.so
-
-	dobin bin/iobuffer
-
-	dodoc README
-}
diff --git a/dev-libs/vrb/vrb-0.5.1.ebuild b/dev-libs/vrb/vrb-0.5.1-r1.ebuild
similarity index 60%
rename from dev-libs/vrb/vrb-0.5.1.ebuild
rename to dev-libs/vrb/vrb-0.5.1-r1.ebuild
index 26e7d4fa1a62..86693d999d93 100644
--- a/dev-libs/vrb/vrb-0.5.1.ebuild
+++ b/dev-libs/vrb/vrb-0.5.1-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=6
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Library for a virtual ring buffer"
@@ -10,34 +12,37 @@ SRC_URI="http://vrb.slashusr.org/download/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="static"
 RESTRICT="strip"
 
 DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	sys-libs/glibc"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+)
 
-src_compile() {
-	epatch "${FILESDIR}"/${P}-configure.patch
+DOCS=( README )
 
+src_configure() {
 	CC="$(tc-getCC)" ./configure --prefix=/usr || die "Configure failed!"
-	make || die "Make failed!"
 }
 
 src_install() {
 	insinto /usr/include
 	doins build/include/vrb.h
 
-	mkdir "${D}"usr/lib
+	mkdir "${D}"usr/lib || die
 
-	if use static ; then
-		cp build/lib/libvrb.a* "${D}"usr/lib/
+	if use static; then
+		cp build/lib/libvrb.a* "${D}"usr/lib/ || die
 	fi
 
-	cp build/lib/libvrb.so* "${D}"usr/lib/
+	cp build/lib/libvrb.so* "${D}"usr/lib/ || die
 
 	dobin build/bin/vbuf
-
-	dodoc README
 	doman vrb/man/man3/*.3
 }
diff --git a/dev-lisp/flexi-streams/Manifest b/dev-lisp/flexi-streams/Manifest
index 3a09bbea6721..30ec1d3d8849 100644
--- a/dev-lisp/flexi-streams/Manifest
+++ b/dev-lisp/flexi-streams/Manifest
@@ -1 +1 @@
-DIST v1.0.15.tar.gz 135550 SHA256 1c9d8020cfd2bf0344e5baf1dff8b01aa7cefcdc5bc3765d029bd2e723d00251 SHA512 103e6c53f8c0ffd6d218e08e49fd49c21f420c1221912121dba1218d4631b6869357002fb1a18444e58283e2d6e59ae3f43d5a23c06c506538d69f4a178b3973 WHIRLPOOL d8a88f21b26079f86d5deb55cfeae0bc4c7f34d853e4b2a887eeb829f38e5be8d8902dea675caa7d373503f25c798b2492d6a1212fb58ea15e352e1c3c9b90fa
+DIST flexi-streams-1.0.15.tar.gz 135550 SHA256 1c9d8020cfd2bf0344e5baf1dff8b01aa7cefcdc5bc3765d029bd2e723d00251 SHA512 103e6c53f8c0ffd6d218e08e49fd49c21f420c1221912121dba1218d4631b6869357002fb1a18444e58283e2d6e59ae3f43d5a23c06c506538d69f4a178b3973 WHIRLPOOL d8a88f21b26079f86d5deb55cfeae0bc4c7f34d853e4b2a887eeb829f38e5be8d8902dea675caa7d373503f25c798b2492d6a1212fb58ea15e352e1c3c9b90fa
diff --git a/dev-lisp/flexi-streams/flexi-streams-1.0.15.ebuild b/dev-lisp/flexi-streams/flexi-streams-1.0.15.ebuild
index 54995d59fbc4..2968cb844cc0 100644
--- a/dev-lisp/flexi-streams/flexi-streams-1.0.15.ebuild
+++ b/dev-lisp/flexi-streams/flexi-streams-1.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,12 +6,10 @@ EAPI=5
 
 inherit common-lisp-3
 
-MY_V="v${PV}"
-
 DESCRIPTION="Flexible bivalent streams for Common Lisp"
 HOMEPAGE="http://weitz.de/flexi-streams/
 		http://www.cliki.net/flexi-streams/"
-SRC_URI="https://github.com/edicl/${PN}/archive/${MY_V}.tar.gz"
+SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index eaeb7f0d6724..216450ca4b95 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -24,3 +24,6 @@ DIST sbcl-1.3.6-source.tar.bz2 5744537 SHA256 f017ac1bd8fe0ad56a4cfda4f7543a06a8
 DIST sbcl-1.3.6-x86-64-linux-binary.tar.bz2 9489811 SHA256 2f0c9e5ab2c6b7d669df03ca6eea0c7abd5e01fb26bfde0bfe91fac9a40099e3 SHA512 5fc170c2396299fba62d46869fce8e69a1fc3d62b9f1061e962bbba219e064c9f21992cb4b929ddc2661c8e24c8bb7b6bbfa8644db70371cba16492c84d12faf WHIRLPOOL a175678b4bef14e0b6c0061b2269f9b8e76846e72cf463c25dd4144face1f507a105d9d762fa9fb7998306f4d643cf3efff2c140d8f880fb868ab94385ed738f
 DIST sbcl-1.3.8-source.tar.bz2 5754599 SHA256 30237f4e39f05013e0937d5273a08aab44a0bd74832e901ee8bfbfe6f5cfd049 SHA512 1d1fc6bdc715bf2590cc1d7a747bdab48409b1c77ab05bc3c43135011ca2d58ce2877d672da3117abb6b4d1ac57063d7fb2163bc74458d8f3eaf886174c09a66 WHIRLPOOL 4dd121a8fd68b656ad8d0f284d7854c2dc92a6f7f9135be0be25e0d93f94212d051e0d04a6b2d0db1a36fb584cf81ba1f5e77aab77209efd8fe81eff324fef01
 DIST sbcl-1.3.8-x86-64-linux-binary.tar.bz2 9471946 SHA256 1cb0fccd208856d083c71c2ca6460c30558ca685743a88b6232d79a9902d554a SHA512 c5d352ae6b43d0b05c44311bcaeca2a3901fe3e0f17f4659e3054643b054b2a00df7c27ad931a8c02193e0a544c8bbde36d1c484565286067840f547311263d8 WHIRLPOOL 90adf9ce29dba43ef5ca893592fbf2345eb63df5103d74c497045ea3254db1e06233fdec474b618c909e1f63bd96e425aeaab665387d23d3a921636876c2a4af
+DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 SHA256 da2d296a8ab107a7b2e10831836648d882b01193f60269853932af4f63a06571 SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd WHIRLPOOL d2dde314d2b49e4246823032d953bbfe0858f7c69d0445da356426f9c5fac73036b32c1c048cf7f43615fa02707e8e434d8b085942e79d1e2b20f6fcb7e08919
+DIST sbcl-1.3.9-source.tar.bz2 5758174 SHA256 af0f09d4379113dfd5aa255279cb3df9cb9cac0bcd65369cc43dd857ca51de6e SHA512 56a0e8e84563cf3725326d68bb99baa4d3185e92e8c3087bd7ec5a216135e5bc5d5ae3b798f541de3e581aeb16230db9e3893c5014ff506e723a4a9d93bb041b WHIRLPOOL 1dc8aa16231b235fa2383ff371b6437de4eb0da9193830c597b1d44a37be796dd4ac842dff826f7698d90dd226d41956f56012cc185c199b4ee8fcde24b506a9
+DIST sbcl-1.3.9-x86-64-linux-binary.tar.bz2 9434721 SHA256 04a8c4aac040afd7e6f4b36e67a32de5d202ec8ef15b9f3b73a070f67f09360a SHA512 9a554d4d9a51be0b6fbaef18e6b683da6384c6ff131155f32b98e43bbc729312477d8a37d5059ecba086519b4d7cc35df1396771e14db47413d83d9807979a24 WHIRLPOOL 438a67bbe049524883f3ce087b8c1153f146ced00087c2d61f2cc9c8cac28c477584408d3aaeb9b19bfecb25563e1b1c64763947ee77d95b5aa2213866b5750b
diff --git a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
deleted file mode 100644
index bf03ada518fe..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sbcl-1.1.17-orig/src/runtime/Config.x86-linux	2014-03-31 03:14:22.000000000 +1100
-+++ sbcl-1.1.17/src/runtime/Config.x86-linux	2014-04-28 15:34:59.822482441 +1000
-@@ -27,7 +27,7 @@
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic -m32
-+LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
---- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux	2014-03-31 03:14:22.000000000 +1100
-+++ sbcl-1.1.17/src/runtime/Config.x86-64-linux	2014-04-28 15:35:22.364623003 +1000
-@@ -27,7 +27,7 @@
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+LINKFLAGS += -Wl,--export-dynamic -nopie
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
diff --git a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
deleted file mode 100644
index 850fd5d9dba7..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos
---- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos	2015-04-27 20:56:50.000000000 +0600
-+++ sbcl-1.2.11/src/runtime/Config.x86-sunos	2015-04-28 22:38:01.569103626 +0600
-@@ -12,6 +12,6 @@
- CC=gcc
- CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--NM = nm -xgp
--GREP = ggrep
-+NM = nm -t x -p
-+GREP = grep
- 
- ASSEM_SRC = x86-assem.S ldso-stubs.S
diff --git a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
deleted file mode 100644
index ade4f0868c67..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -U2 sbcl-1.2.13.orig/make.sh sbcl-1.2.13/make.sh
---- sbcl-1.2.13.orig/make.sh	2015-06-29 01:24:03.000000000 +0600
-+++ sbcl-1.2.13/make.sh	2015-06-29 15:53:04.430927942 +0600
-@@ -25,5 +25,5 @@
- # any --xc-host parameter should be suitable for the host machine
- # instead of the target.
--sh make-config.sh "$@" || exit $?
-+sh -x make-config.sh "$@" || exit $?
- 
- . output/prefix.def
-@@ -70,9 +70,9 @@
- # and the make-target-*.sh scripts will take care of transferring the
- # necessary files.
--time sh make-host-1.sh
--time sh make-target-1.sh
--time sh make-host-2.sh
--time sh make-target-2.sh
--time sh make-target-contrib.sh
-+time sh -x make-host-1.sh
-+time sh -x make-target-1.sh
-+time sh -x make-host-2.sh
-+time sh -x make-target-2.sh
-+time sh -x make-target-contrib.sh
- 
- NCONTRIBS=`find contrib -name Makefile -print | wc -l`
diff --git a/dev-lisp/sbcl/sbcl-1.3.9.ebuild b/dev-lisp/sbcl/sbcl-1.3.9.ebuild
new file mode 100644
index 000000000000..3c166b79f39f
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.3.9.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.3.9
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.9
+BV_ARM64=1.3.9
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/gentoo-fix_install_man.patch
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.2.6.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+	# To make the hardened compiler NOT compile with -fPIE -pie
+	if gcc-specs-pie ; then
+		einfo "Disabling PIE..."
+		eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+	fi
+
+	eapply_user
+
+	# bug #526194
+	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-perl/Apache-SizeLimit/files/Apache-SizeLimit-0.95-Fix_Linux-Smaps_detection.patch b/dev-perl/Apache-SizeLimit/files/Apache-SizeLimit-0.95-Fix_Linux-Smaps_detection.patch
deleted file mode 100644
index 56283f842509..000000000000
--- a/dev-perl/Apache-SizeLimit/files/Apache-SizeLimit-0.95-Fix_Linux-Smaps_detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6b1b60546ffca416a65d047a1c0d5d2b610b4dac Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Fri, 25 Mar 2011 17:42:54 +0100
-Subject: [PATCH] Fix Linux::Smaps detection to *not* die if /proc/self/smaps doesn't exist
-
----
- lib/Apache/SizeLimit/Core.pm |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/Apache/SizeLimit/Core.pm b/lib/Apache/SizeLimit/Core.pm
-index 5942bc8..f2fbac4 100644
---- a/lib/Apache/SizeLimit/Core.pm
-+++ b/lib/Apache/SizeLimit/Core.pm
-@@ -143,7 +143,7 @@ BEGIN {
- 
-         *_platform_getppid = \&_linux_getppid;
- 
--        if (eval { require Linux::Smaps } && Linux::Smaps->new($$)) {
-+        if (eval { require Linux::Smaps && Linux::Smaps->new($$) }) {
-             $USE_SMAPS = 1;
-             *_platform_check_size = \&_linux_smaps_size_check;
-         }
--- 
-1.7.3.4
-
diff --git a/dev-perl/AppConfig/files/blockdiffs.patch b/dev-perl/AppConfig/files/blockdiffs.patch
deleted file mode 100644
index 2e30310a8884..000000000000
--- a/dev-perl/AppConfig/files/blockdiffs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naurp AppConfig-1.65.orig/lib/AppConfig/File.pm AppConfig-1.65/lib/AppConfig/File.pm
---- AppConfig-1.65.orig/lib/AppConfig/File.pm	2007-05-30 07:24:09.000000000 -0400
-+++ AppConfig-1.65/lib/AppConfig/File.pm	2007-06-09 07:08:21.000000000 -0400
-@@ -38,6 +38,7 @@ sub new {
-         STATE    => $state,                # AppConfig::State ref
-         DEBUG    => $state->_debug(),      # store local copy of debug 
-         PEDANTIC => $state->_pedantic,     # and pedantic flags
-+        BLOCKSEP => $state->_blocksep,     # and block separator
-     };
- 
-     bless $self, $class;
-@@ -80,7 +81,7 @@ sub parse {
-     my $flag;
- 
-     # take a local copy of the state to avoid much hash dereferencing
--    my ($state, $debug, $pedantic) = @$self{ qw( STATE DEBUG PEDANTIC ) };
-+    my ($state, $debug, $pedantic, $blocksep) = @$self{ qw( STATE DEBUG PEDANTIC BLOCKSEP ) };
- 
-     # we want to install a custom error handler into the AppConfig::State 
-     # which appends filename and line info to error messages and then 
-@@ -163,7 +164,7 @@ sub parse {
-             s/\s+$//;
- 
-             # look for a [block] to set $prefix
--            if (/^\[([^\]]+)\]$/) {
-+            if (/^\[\s*([^\]\s]+)\s*\]$/) {
-                 $prefix = $1;
-                 print STDERR "Entering [$prefix] block\n" if $debug;
-                 next;
-@@ -194,7 +195,7 @@ sub parse {
-                 $flag = $1;
- 
-                 # $variable gets any $prefix 
--                $variable = $prefix . '_' . $variable
-+                $variable = $prefix . $blocksep . $variable
-                     if length $prefix;
- 
-                 # if the variable doesn't exist, we call set() to give 
-diff -Naurp AppConfig-1.65.orig/lib/AppConfig/State.pm AppConfig-1.65/lib/AppConfig/State.pm
---- AppConfig-1.65.orig/lib/AppConfig/State.pm	2007-05-30 07:24:20.000000000 -0400
-+++ AppConfig-1.65/lib/AppConfig/State.pm	2007-06-09 07:11:16.000000000 -0400
-@@ -53,7 +53,7 @@ my %METHVARS;
- 
- # internal values that AUTOLOAD should provide access to
- my %METHFLAGS;
--   @METHFLAGS{ qw( PEDANTIC ) } = ();
-+   @METHFLAGS{ qw( PEDANTIC BLOCKSEP ) } = ();
- 
- # variable attributes that may be specified in GLOBAL;
- my @GLOBAL_OK = qw( DEFAULT EXPAND VALIDATE ACTION ARGS ARGCOUNT );
-@@ -94,6 +94,7 @@ sub new {
-         PEDANTIC   => 0,       # return immediately on parse warnings
-         EHANDLER   => undef,   # error handler (let's hope we don't need it!)
-         ERROR      => '',      # error message
-+        BLOCKSEP   => '_',     # separator between [block] and variable name
-     };
- 
-     bless $self, $class;
-@@ -504,8 +505,8 @@ sub _configure {
-             next;
-         };
-             
--        # CASE, CREATE and PEDANTIC are stored as they are
--        $opt =~ /^CASE|CREATE|PEDANTIC$/i && do {
-+        # CASE, CREATE, PEDANTIC and BLOCKSEP are stored as they are
-+        $opt =~ /^CASE|CREATE|PEDANTIC|BLOCKSEP$/i && do {
-             $self->{ uc $opt } = $cfg->{ $opt };
-             next;
-         };
-@@ -1015,6 +1016,13 @@ instantiated with a reference to an App:
- DEBUG (and also PEDANTIC) values of the state at that time.  Subsequent
- changes to the AppConfig::State debug value will not affect them.
- 
-+=item BLOCKSEP
-+
-+When parsing configuration files that are grouped using constructions
-+like [block], this string parameter determines what is used to
-+separate the name of the block from the name of each variable
-+contained within it.  If unspecified, BLOCKSEP defaults to '_'.
-+
- =item GLOBAL 
- 
- The GLOBAL option allows default values to be set for the DEFAULT, ARGCOUNT, 
diff --git a/dev-perl/CGI/files/3.47-fcgi.patch b/dev-perl/CGI/files/3.47-fcgi.patch
deleted file mode 100644
index 922a577f14b5..000000000000
--- a/dev-perl/CGI/files/3.47-fcgi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://rt.cpan.org/Public/Bug/Display.html?id=49599
-
---- CGI.pm-3.47/t/fast.t
-+++ CGI.pm-3.47/t/fast.t
-@@ -7,16 +7,16 @@
- 	$fcgi = $@ ? 0 : 1;
- }
- 
--use Test::More tests => 10;
-+use Test::More tests => 11;
- 
- # Shut up "used only once" warnings.
- () = $CGI::Q;
- () = $CGI::Fast::Ext_Request;
- 
- SKIP: {
--	skip( 'FCGI not installed, cannot continue', 7 ) unless $fcgi;
-+	skip( 'FCGI not installed, cannot continue', 11 ) unless $fcgi;
- 
--	use CGI::Fast;
-+	use_ok( CGI::Fast );
- 	ok( my $q = CGI::Fast->new(), 'created new CGI::Fast object' );
- 	is( $q, $CGI::Q, 'checking to see if the object was stored properly' );
- 	is( $q->param(), (), 'no params' );
diff --git a/dev-perl/Config-General/Config-General-2.630.0.ebuild b/dev-perl/Config-General/Config-General-2.630.0.ebuild
new file mode 100644
index 000000000000..a8d50a94a8b2
--- /dev/null
+++ b/dev-perl/Config-General/Config-General-2.630.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=TLINDEN
+DIST_VERSION=2.63
+DIST_EXAMPLES=("example.cfg")
+inherit perl-module
+
+DESCRIPTION="Config file parser module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Config-General/Manifest b/dev-perl/Config-General/Manifest
index 192e58ff866e..421a8fa31f1e 100644
--- a/dev-perl/Config-General/Manifest
+++ b/dev-perl/Config-General/Manifest
@@ -1,2 +1,3 @@
 DIST Config-General-2.60.tar.gz 61992 SHA256 5154146c0632ea1ccf7a3f9a7d893f001322ebc7b651254b458ca5dc77fe38ae SHA512 57ea94fd55705c8c16a2008a39ec243ff5180589a552ac857debb4b821636843e4bb06c9a49d1b8e539aa8fd9b3b960d9655945e0d79ffaebb6fa51ba6935f58 WHIRLPOOL 3a35d0334282e3410338591d4e92f899d9eb46f65e56b0fc3d620a1d36bfb7da9c4008fd88751002077d4c40fc283f6d9fba2ba4bc756cdcb121231b2641c2c5
 DIST Config-General-2.62.tar.gz 64245 SHA256 30523ab8b80d6649041193022818130ba3e685a18f3f4325e766893d35e3fe59 SHA512 cdf41ef80f47b778ee00826771e6a62d542cc9f5d8561d08083f9f34ebbe9d8ea0bcfc1a983bc1bc510820b3250666cea9f6dee30b0c780e5417520570340075 WHIRLPOOL 3ec6345560e174d373ae6c8eef66d3b39dbf9b1c6f56cba71518d9d7b211f0544f821c9305618111b3ba3b38940b2224bf713d88b80447c1c573847231b960b7
+DIST Config-General-2.63.tar.gz 64700 SHA256 0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad SHA512 ba9fdbf992049936ea288a90d8f8360821fc96f8d42df0298888b25543d2ac43e2958c5f7a8bbbae7cad1e2151ea00528756a3bc0cfbe408e5ee82bf309615f3 WHIRLPOOL b15a7befcebdf6bbcb6892b28db9257a4222e20f0eeda09083d64fd7826e9356ff7bec311203c5a8bba26ed5e5f78deaf062d94c922575e43db9a6e345610017
diff --git a/dev-perl/Crypt-Cracklib/files/1.4-disable-reversed-test.patch b/dev-perl/Crypt-Cracklib/files/1.4-disable-reversed-test.patch
deleted file mode 100644
index f8cde3865ad3..000000000000
--- a/dev-perl/Crypt-Cracklib/files/1.4-disable-reversed-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Crypt-Cracklib-1.4/t/01use.t
-+++ Crypt-Cracklib-1.4/t/01use.t
-@@ -1,4 +1,4 @@
--use Test::More tests => 19;
-+use Test::More tests => 18;
- 
- BEGIN { use_ok( 'Crypt::Cracklib' ); }
- 
-@@ -28,7 +28,7 @@
- like(fascist_check('dictionary'), qr/dictionary/, "dictionary");
- 
- # it is based on a (reversed) dictionary word
--like(fascist_check('1elppa'), qr/reversed/, "reversed dictionary");
-+#like(fascist_check('1elppa'), qr/reversed/, "reversed dictionary");
- 
- # Ok
- ok(fascist_check('Sil1ntBob') eq 'ok');
diff --git a/dev-perl/Crypt-DSA/files/crypt-dsa-1.16-dsaparam.patch b/dev-perl/Crypt-DSA/files/crypt-dsa-1.16-dsaparam.patch
deleted file mode 100644
index fe3dfbb6480d..000000000000
--- a/dev-perl/Crypt-DSA/files/crypt-dsa-1.16-dsaparam.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://rt.cpan.org/Public/Bug/Display.html?id=49668
-http://cvs.fedoraproject.org/viewvc/rpms/perl-Crypt-DSA/devel/perl-Crypt-DSA-dsaparam.patch?view=log
-
---- lib/Crypt/DSA/KeyChain.pm
-+++ lib/Crypt/DSA/KeyChain.pm
-@@ -53,7 +53,7 @@
-             my $cur_part;
-             foreach (@res) {
-                 if (/^\s+(\w):\s*$/) {
--                    $cur_part = $1;
-+                    $cur_part = lc($1);
-                     next;
-                 }
-                 if (/^\s*((?:[0-9a-f]{2,2}:?)+)\s*$/) {
diff --git a/dev-perl/Data-ShowTable/files/3.3.patch b/dev-perl/Data-ShowTable/files/3.3.patch
deleted file mode 100644
index 4a9e2d402125..000000000000
--- a/dev-perl/Data-ShowTable/files/3.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- showtable
-+++ showtable
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl5
-+#!/usr/bin/perl
- # showtable - read data and show it
- #
- #    Copyright (C) 1996,1997  Alan K. Stebbens <aks@sgi.com>
---- ShowTable.pm
-+++ ShowTable.pm
-@@ -721,7 +721,7 @@
- 
- S<  >B<ShowHTMLTable> I<\@titles>, I<\@types>, I<\@widths>, I<\&row_sub>
- [, I<\&fmt_sub> [, I<$max_width> [, I<\%URL_Keys> [, I<$no_escape> 
--[, I<\@title_formats [, I<\@data_formats [, I<$table_attrs> ] ] ] ] ] ] ];
-+[, I<\@title_formats> [, I<\@data_formats> [, I<$table_attrs> ] ] ] ] ] ] ];
- 
- The B<ShowHTMLTable> displays one or more rows of columns of data using
- the HTML C<\<TABLE\>> feature.  In addition to the usual parameter arguments
---- t/Test-Setup.pl
-+++ t/Test-Setup.pl
-@@ -19,7 +19,7 @@
- 
- sub talk { print STDERR @_; }
- 
--sub start_tests {
-+sub start_tests($) {
-     my $count = shift;		# how many tests?
-     mkdir("$testdir/out",0755)  unless -d "$testdir/out";
-     print "1..$count\n";	# tell harness how many tests
-@@ -50,7 +50,7 @@
- 
- # run_test $num, \&sub;
- 
--sub run_test {
-+sub run_test($&) {
-     my $num = shift;
-     my $sub = shift;
- 
diff --git a/dev-perl/Email-Valid/files/0.185-disable-online-test.patch b/dev-perl/Email-Valid/files/0.185-disable-online-test.patch
deleted file mode 100644
index 6bcbf6d5df91..000000000000
--- a/dev-perl/Email-Valid/files/0.185-disable-online-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/t/valid.t
-+++ b/t/valid.t
-@@ -85,6 +85,5 @@
- );
- 
- SKIP: {
--  skip "your dns appears missing or failing to resolve", 2
--    unless eval { $v->address(-address=> 'devnull@pobox.com', -mxcheck => 1) };
-+  skip "disabled online tests", 2;
- 
diff --git a/dev-perl/GSSAPI/files/0.26-libs-parse.patch b/dev-perl/GSSAPI/files/0.26-libs-parse.patch
deleted file mode 100644
index fa72cedaf04f..000000000000
--- a/dev-perl/GSSAPI/files/0.26-libs-parse.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GSSAPI-0.26/Makefile.PL
-+++ GSSAPI-0.26/Makefile.PL
-@@ -267,7 +267,7 @@
-    my ( $confstringstring ) = @_;
-    my (@libs, @others);
-    foreach ( split ' ',  $confstringstring ) {
--      if ( m/(-(Wl,-R|[LlR])[^ ]*)/) {
-+      if ( m/(^-(Wl,-R|[LlR])[^ ]*)/) {
-         push @libs, $1
-       } else {
-         push @others, $_;
diff --git a/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
index 7aad3108ab48..b0e2873aad97 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,4 +18,8 @@ DEPEND="dev-libs/geoip"
 RDEPEND="${DEPEND}"
 
 SRC_TEST=do
-myconf="LIBS=-L/usr/$(get_libdir)"
+
+src_configure() {
+	myconf="LIBS=-L/usr/$(get_libdir)"
+	perl-module_src_configure
+}
diff --git a/dev-perl/Geo-IP/Geo-IP-1.500.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.500.0.ebuild
index 88c72166662c..75b7722ae563 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.500.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.500.0.ebuild
@@ -18,4 +18,8 @@ DEPEND="dev-libs/geoip"
 RDEPEND="${DEPEND}"
 
 SRC_TEST=do
-myconf="LIBS=-L/usr/$(get_libdir)"
+
+src_configure() {
+	myconf="LIBS=-L/usr/$(get_libdir)"
+	perl-module_src_configure
+}
diff --git a/dev-perl/IPC-Shareable/files/fix_perl_5.10_compat.patch b/dev-perl/IPC-Shareable/files/fix_perl_5.10_compat.patch
deleted file mode 100644
index c788d58e03c5..000000000000
--- a/dev-perl/IPC-Shareable/files/fix_perl_5.10_compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://rt.cpan.org/Public/Bug/Display.html?id=41401
-http://bugs.debian.org/507657
-# Getting $# of an already-dereferenced-arrayref is a no-go in Perl 5.10
-Index: libipc-shareable-perl/lib/IPC/Shareable.pm
-===================================================================
---- libipc-shareable-perl.orig/lib/IPC/Shareable.pm	2008-12-03 10:51:27.000000000 -0600
-+++ libipc-shareable-perl/lib/IPC/Shareable.pm	2008-12-03 10:51:46.000000000 -0600
-@@ -452,7 +452,7 @@
-     my $n    = shift;
- 
-     $self->{_data} = _thaw($self->{_shm}) unless $self->{_lock};
--    $#{@{$self->{_data}}} = $n - 1;
-+    $#{$self->{_data}} = $n - 1;
-     if ($self->{_lock} & LOCK_EX) {
-         $self->{_was_changed} = 1;
-     } else {
-
diff --git a/dev-perl/Inline/files/gtk2-patch.diff b/dev-perl/Inline/files/gtk2-patch.diff
deleted file mode 100644
index bf28ec596f7b..000000000000
--- a/dev-perl/Inline/files/gtk2-patch.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-*** Inline-0.44/lib/Inline/denter.pm-orig	2001-06-13 06:30:50.000000000 +0200
---- Inline-0.44/lib/Inline/denter.pm	2002-11-13 15:43:41.000000000 +0100
-***************
-*** 177,182 ****
---- 177,183 ----
-  }
-  
-  sub _next_line {
-+     local ($_);
-      my $o = shift;
-      $o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
-      $_ = shift @{$o->{lines}};
-***************
-*** 188,193 ****
---- 189,195 ----
-      $o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
-      my ($width, $tabwidth) = @{$o}{qw(width tabwidth)};
-      while (1) {
-+         local ($_);
-  	$_ = $o->{lines}[0];
-  	# expand tabs in leading whitespace;
-  	$o->next_line, next if /^(\s*$|\#)/; # skip comments and blank lines
-***************
-*** 221,226 ****
---- 223,229 ----
-  
-  sub indent_data {
-      my $o = shift;
-+     local ($_);
-      $_ = shift;
-      return $o->indent_undef($_)
-        if not defined;
diff --git a/dev-perl/MP3-Tag/files/MP3-Tag-makefile.patch b/dev-perl/MP3-Tag/files/MP3-Tag-makefile.patch
deleted file mode 100644
index 1b7873a67375..000000000000
--- a/dev-perl/MP3-Tag/files/MP3-Tag-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.PL.old	2005-12-15 08:45:16.000000000 +0900
-+++ Makefile.PL	2005-12-15 08:45:49.000000000 +0900
-@@ -35,14 +35,6 @@
-     'clean'             => {FILES => 'ID3v2-Data.pod'},
- );
- 
--# Tell MakeMaker about manifying ID3v2-Data.pod
--package MY;
--sub manifypods {
--    my $self = shift;
--    $self->{MAN3PODS}->{'ID3v2-Data.pod'} = '$(INST_MAN3DIR)/MP3::Tag::ID3v2-Data.$(MAN3EXT)';
--    $self->SUPER::manifypods(@_);
--}
--
- sub postamble {	# Not good enough: is done after .pod is moved to INST_LIB...
-   '
- ID3v2-Data.pod :: Tag/ID3v2.pm # pm_to_blib
diff --git a/dev-perl/Mail-Builder/files/1.16-escape-at-for-perl-5.8.patch b/dev-perl/Mail-Builder/files/1.16-escape-at-for-perl-5.8.patch
deleted file mode 100644
index f1d01be226e2..000000000000
--- a/dev-perl/Mail-Builder/files/1.16-escape-at-for-perl-5.8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/t/008_builder.t b/t/008_builder.t
-index bde82ef..5776ba8 100755
---- a/t/008_builder.t
-+++ b/t/008_builder.t
-@@ -139,7 +139,7 @@ is($mime->head->get('Subject'),'Testmail'."\n");
- is($mime->head->get('From'),'"me" <from2@test.com>'."\n");
- 
- is($mime->head->get('Content-Language'),'de'."\n");
--like($mime->head->get('Message-ID'),qr/<[0-9A-Za-z.@-]+>/);
-+like($mime->head->get('Message-ID'),qr/<[0-9A-Za-z.\@-]+>/);
- is($mime->parts,2);
- is($mime->parts(0)->mime_type,'application/pdf');
- is($mime->parts(1)->mime_type,'text/plain');
-\ No newline at end of file
diff --git a/dev-perl/Mail-IMAPClient/files/2.2.9-skiptest.patch b/dev-perl/Mail-IMAPClient/files/2.2.9-skiptest.patch
deleted file mode 100644
index 11ccfb295cfc..000000000000
--- a/dev-perl/Mail-IMAPClient/files/2.2.9-skiptest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.PL.orig	2005-01-07 23:17:00.849874616 -0200
-+++ Makefile.PL	2005-01-07 23:18:32.815893656 -0200
-@@ -49,7 +49,7 @@
- 
- sub set_test_data {
- 	unless (-f "./IMAPClient.pm") { warn "ERROR: not in installation directory\n"; return }
--	return if -f "./test.txt";
-+	return if -f "./Makefile.PL";
- 	print 	"You have the option of running an extended suite of tests during\n",
- 		"'make test'. This requires an IMAP server name, user account, and ",
- 		"password to test with.","\n","\n",
diff --git a/dev-perl/MongoDB/files/gridfs-perl-patch.diff b/dev-perl/MongoDB/files/gridfs-perl-patch.diff
deleted file mode 100644
index 3e9c6c9c4d83..000000000000
--- a/dev-perl/MongoDB/files/gridfs-perl-patch.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/lib/MongoDB/GridFS.pm b/lib/MongoDB/GridFS.pm
-index f9a2421..8a9c4a7 100644
---- a/lib/MongoDB/GridFS.pm
-+++ b/lib/MongoDB/GridFS.pm
-@@ -119,13 +119,19 @@ sub BUILD {
-     my ($self) = @_;
-    
-     # check for the required indexs in the system.indexes colleciton
--    my $count = $self->_database->get_collection('system.indexes')->count({filename => 1});
--    $count   += $self->_database->get_collection('system.indexes')->count({files_id => 1, n => 1});
--    
--    # if we dont have the required indexes, create them now.
--    if ($count < 2){
--       $self->_ensure_indexes();
-+    my @files_idx = $self->files->get_indexes;
-+    my @matches = grep { $_->{key}->{filename} } @files_idx;
-+    if (scalar @matches == 0) {
-+        $self->files->ensure_index(Tie::IxHash->new(filename => 1), {"safe" => 1});
-+    }
-+
-+    my @chunks_idx = $self->chunks->get_indexes;
-+    @matches = grep { (defined $_->{key}->{files_id} && defined $_->{key}->{i} && 
-+        $_->{key}->{files_id} == 1 && $_->{key}->{i} == 1)} @chunks_idx;
-+    if (scalar @matches == 0) {
-+        $self->chunks->ensure_index(Tie::IxHash->new(files_id => 1, n => 1), {"safe" => 1});
-     }
-+
- }
- 
- 
-@@ -134,7 +140,7 @@ sub _ensure_indexes {
- 
-     # ensure the necessary index is present (this may be first usage)
-     $self->files->ensure_index(Tie::IxHash->new(filename => 1), {"safe" => 1});
--    $self->chunks->ensure_index(Tie::IxHash->new(files_id => 1, n => 1), {"safe" => 1, "unique" => 1});
-+    $self->chunks->ensure_index(Tie::IxHash->new(files_id => 1, n => 1), {"safe" => 1});
- }
- 
- =head1 METHODS
diff --git a/dev-perl/PDL/files/PDL-2.4.3-PIC.patch b/dev-perl/PDL/files/PDL-2.4.3-PIC.patch
deleted file mode 100644
index ee6db253e4c2..000000000000
--- a/dev-perl/PDL/files/PDL-2.4.3-PIC.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Lib/Slatec/Makefile.PL	2007-09-11 18:30:14.000000000 +0200
-+++ Lib/Slatec/Makefile.PL	2007-09-11 18:28:55.000000000 +0200
-@@ -136,7 +136,7 @@
- ("
- 
- slatec/$_\$(OBJ_EXT): slatec/$_.f 
--	$mycompiler -c $hack_64bit -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
-+	$mycompiler -c -fPIC -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
- " )} @slatecfiles;
-  
- }
diff --git a/dev-perl/PDL/files/PDL-2.4.4-PIC.patch b/dev-perl/PDL/files/PDL-2.4.4-PIC.patch
deleted file mode 100644
index a0087c9f5edd..000000000000
--- a/dev-perl/PDL/files/PDL-2.4.4-PIC.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Lib/Minuit/Makefile.PL
-+++ Lib/Minuit/Makefile.PL
-@@ -149,7 +149,7 @@
- 	    ("
- 
- minuitlib/$_\$(OBJ_EXT): minuitlib/$_.f 
--	$mycompiler -c $hack_64bit -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
-+	$mycompiler -c -fPIC -o minuitlib/$_\$(OBJ_EXT) $mycflags minuitlib/$_.f
- " )} @minuitfiles;
- 
- 	if (!defined($PDL::Config{MINUIT_LIB})){
---- Lib/Slatec/Makefile.PL
-+++ Lib/Slatec/Makefile.PL
-@@ -136,7 +136,7 @@
- ("
- 
- slatec/$_\$(OBJ_EXT): slatec/$_.f 
--	$mycompiler -c $hack_64bit -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
-+	$mycompiler -c -fPIC -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f
- " )} @slatecfiles;
-  
- }
diff --git a/dev-perl/Perl-Tidy/files/Perl-Tidy-20130922.0.0-CVE-2014-2277.patch b/dev-perl/Perl-Tidy/files/Perl-Tidy-20130922.0.0-CVE-2014-2277.patch
deleted file mode 100644
index f52e3f6b7f1f..000000000000
--- a/dev-perl/Perl-Tidy/files/Perl-Tidy-20130922.0.0-CVE-2014-2277.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Replace insecure make_temporary_filename with File::Temp::tempfile
-Forwarded: http://lists.example.com/2010/03/1234.html
-Origin: vendor, http://bugs.debian.org/740670
-Author: Don Armstrong <don@debian.org>
-Last-Update: 2010-03-29
---- a/lib/Perl/Tidy.pm
-+++ b/lib/Perl/Tidy.pm
-@@ -76,6 +76,7 @@
- use IO::File;
- use File::Basename;
- use File::Copy;
-+use File::Temp qw(tempfile);
- 
- BEGIN {
-     ( $VERSION = q($Id: perltidy-20130922.0.0-CVE-2014-2277.patch,v 1.1 2014/03/11 18:40:27 civil Exp $) ) =~ s/^.*\s+(\d+)\/(\d+)\/(\d+).*$/$1$2$3/; # all one line for MakeMaker
-@@ -235,35 +236,6 @@
-     return undef;
- }
- 
--sub make_temporary_filename {
--
--    # Make a temporary filename.
--    # The POSIX tmpnam() function has been unreliable for non-unix systems
--    # (at least for the win32 systems that I've tested), so use a pre-defined
--    # name for them.  A disadvantage of this is that two perltidy
--    # runs in the same working directory may conflict.  However, the chance of
--    # that is small and manageable by the user, especially on systems for which
--    # the POSIX tmpnam function doesn't work.
--    my $name = "perltidy.TMP";
--    if ( $^O =~ /win32|dos/i || $^O eq 'VMS' || $^O eq 'MacOs' ) {
--        return $name;
--    }
--    eval "use POSIX qw(tmpnam)";
--    if ($@) { return $name }
--    use IO::File;
--
--    # just make a couple of tries before giving up and using the default
--    for ( 0 .. 3 ) {
--        my $tmpname = tmpnam();
--        my $fh = IO::File->new( $tmpname, O_RDWR | O_CREAT | O_EXCL );
--        if ($fh) {
--            $fh->close();
--            return ($tmpname);
--            last;
--        }
--    }
--    return ($name);
--}
- 
- # Here is a map of the flow of data from the input source to the output
- # line sink:
-@@ -1324,11 +1296,7 @@
-             my ( $fh_stream, $fh_name ) =
-               Perl::Tidy::streamhandle( $stream, 'r' );
-             if ($fh_stream) {
--                my ( $fout, $tmpnam );
--
--                # TODO: fix the tmpnam routine to return an open filehandle
--                $tmpnam = Perl::Tidy::make_temporary_filename();
--                $fout = IO::File->new( $tmpnam, 'w' );
-+                my ( $fout, $tmpnam ) = tempfile();
- 
-                 if ($fout) {
-                     $fname      = $tmpnam;
-@@ -5159,14 +5127,7 @@
-     # Pod::Html requires a real temporary filename
-     # If we are making a frame, we have a name available
-     # Otherwise, we have to fine one
--    my $tmpfile;
--    if ( $rOpts->{'frames'} ) {
--        $tmpfile = $self->{_toc_filename};
--    }
--    else {
--        $tmpfile = Perl::Tidy::make_temporary_filename();
--    }
--    my $fh_tmp = IO::File->new( $tmpfile, 'w' );
-+    my ($fh_tmp,$tmpfile) = tempfile();
-     unless ($fh_tmp) {
-         Perl::Tidy::Warn
-           "unable to open temporary file $tmpfile; cannot use pod2html\n";
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.09-prefix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.09-prefix.patch
deleted file mode 100644
index 49e9dad7b3e5..000000000000
--- a/dev-perl/PortageXS/files/PortageXS-0.02.09-prefix.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ur PortageXS-0.02.09.orig/lib/PortageXS/Core.pm PortageXS-0.02.09/lib/PortageXS/Core.pm
---- PortageXS-0.02.09.orig/lib/PortageXS/Core.pm	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/lib/PortageXS/Core.pm	2009-03-18 20:56:20 +0100
-@@ -94,7 +94,7 @@
- 	my $self		= shift;
- 	my $param		= shift;
- 	my @files		= ();
--	my @etcfiles		= qw(/etc/make.globals /etc/make.conf);
-+	my @etcfiles		= qw(@GENTOO_PORTAGE_EPREFIX@/etc/make.globals @GENTOO_PORTAGE_EPREFIX@/etc/make.conf);
- 	my @profilefiles	= ();
- 	my $v			= '';
- 	my $parent		= '';
-@@ -139,7 +139,7 @@
- 	
- 	# - Defaults >
- 	if ($param eq 'PORTDIR' && !$v) {
--		$v='/usr/portage';
-+		$v='@GENTOO_PORTAGE_EPREFIX@/usr/portage';
- 	}
- 	
- 	return $v;
-@@ -166,7 +166,7 @@
- 		return $self->{'PORTDIR'};
- 	}
- 	else {
--		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR','lastseen');
-+		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'PORTDIR','lastseen');
- 		return $self->{'PORTDIR'};
- 	}
- }
-@@ -183,7 +183,7 @@
- 	my $self	= shift;
- 	my $forcereload	= shift;
- 	
--	return split(/ /,$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
-+	return split(/ /,$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
- }
- 
- # Description:
-diff -ur PortageXS-0.02.09.orig/lib/PortageXS.pm PortageXS-0.02.09/lib/PortageXS.pm
---- PortageXS-0.02.09.orig/lib/PortageXS.pm	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/lib/PortageXS.pm	2009-03-18 20:52:29 +0100
-@@ -61,8 +61,8 @@
- 	$self->{'VERSION'}			= $VERSION;
- 	
- 	$self->{'PORTDIR'}			= $self->getPortdir();
--	$self->{'PKG_DB_DIR'}			= '/var/db/pkg/';
--	$self->{'PATH_TO_WORLDFILE'}		= '/var/lib/portage/world';
-+	$self->{'PKG_DB_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg/';
-+	$self->{'PATH_TO_WORLDFILE'}		= '@GENTOO_PORTAGE_EPREFIX@/var/lib/portage/world';
- 	$self->{'IS_INITIALIZED'}		= 1;
- 	
- 	$self->{'EXCLUDE_DIRS'}{'.'}		= 1;
-@@ -75,9 +75,9 @@
- 	$self->{'EXCLUDE_DIRS'}{'CVS'}		= 1;
- 	$self->{'EXCLUDE_DIRS'}{'.cache'}	= 1;
- 	
--	$self->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
--	$self->{'ETC_DIR'}			= '/etc/';
--	$self->{'MAKE_PROFILE_PATH'}		= '/etc/make.profile';
-+	$self->{'PORTAGEXS_ETC_DIR'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/';
-+	$self->{'ETC_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/etc/';
-+	$self->{'MAKE_PROFILE_PATH'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/make.profile';
- 	
- 	# - init colors >
- 	$self->{'COLORS'}{'YELLOW'}		= color('bold yellow');
-@@ -89,7 +89,7 @@
- 	$self->{'COLORS'}{'BLUE'}		= color('bold blue');
- 	$self->{'COLORS'}{'RESET'}		= color('reset');
- 	
--	if (lc($self->getParamFromFile($self->getFileContents('/etc/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
-+	if (lc($self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
- 		$self->{'COLORS'}{'YELLOW'}		= '';
- 		$self->{'COLORS'}{'GREEN'}		= '';
- 		$self->{'COLORS'}{'LIGHTGREEN'}		= '';
-diff -ur PortageXS-0.02.09.orig/usr/bin/portagexs_client PortageXS-0.02.09/usr/bin/portagexs_client
---- PortageXS-0.02.09.orig/usr/bin/portagexs_client	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/usr/bin/portagexs_client	2009-03-18 20:52:29 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
- 
- # -----------------------------------------------------------------------------
- #
-@@ -54,9 +54,9 @@
- 				SSL_use_cert => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub { return "" },
--				SSL_key_file => '/etc/pxs/certs/client-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/client-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 				 ))) {
- 	$pxs->print_err("unable to create socket: ".&IO::Socket::SSL::errstr."\n");
- 	$pxs->print_err("Server down?\n");
-diff -ur PortageXS-0.02.09.orig/usr/sbin/portagexsd PortageXS-0.02.09/usr/sbin/portagexsd
---- PortageXS-0.02.09.orig/usr/sbin/portagexsd	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/usr/sbin/portagexsd	2009-03-18 20:52:29 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -t
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -t
- 
- # -----------------------------------------------------------------------------
- #
-@@ -50,7 +50,7 @@
- sub main {
- 	# - Parse config >
- 	my %config	= ();
--	$config{'cfgfiledata'} = $pxs->getFileContents("/etc/pxs/portagexsd.conf");
-+	$config{'cfgfiledata'} = $pxs->getFileContents("@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf");
- 	$config{'Port'} = $pxs->getParamFromFile($config{'cfgfiledata'},"Port","lastseen");
- 	$config{'SSLpasswd'} = $pxs->getParamFromFile($config{'cfgfiledata'},"SSLpasswd","lastseen");
- 	$config{'PidFile'} = $pxs->getParamFromFile($config{'cfgfiledata'},"PidFile","lastseen");
-@@ -60,7 +60,7 @@
- 	$config{'cfgfiledata'} = undef;
- 	
- 	if (!$config{'I_AM_ROOT_AND_I_KNOW_WHAT_I_AM_DOING'}) {
--		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (/etc/pxs/portagexsd.conf)');
-+		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf)');
- 		exit(0);
- 	}
- 	
-@@ -70,9 +71,9 @@
- 				Reuse     => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub {return $config{'SSLpasswd'}},
--				SSL_key_file => '/etc/pxs/certs/server-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/server-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 			)) ) {
- 		syslog("info", "Unable to create socket: ", &IO::Socket::SSL::errstr);
- 		exit(0);
diff --git a/dev-perl/Term-ReadLine-Gnu/files/Term-ReadLine-Gnu-1.270.0-makefile.patch b/dev-perl/Term-ReadLine-Gnu/files/Term-ReadLine-Gnu-1.270.0-makefile.patch
deleted file mode 100644
index 2291c1bd4d1b..000000000000
--- a/dev-perl/Term-ReadLine-Gnu/files/Term-ReadLine-Gnu-1.270.0-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN Term-ReadLine-Gnu-1.27-orig/Makefile.PL Term-ReadLine-Gnu-1.27/Makefile.PL
---- Term-ReadLine-Gnu-1.27-orig/Makefile.PL	2015-09-06 06:21:20.000000000 +0200
-+++ Term-ReadLine-Gnu-1.27/Makefile.PL	2015-09-20 20:17:06.998740899 +0200
-@@ -317,7 +317,7 @@
- 	system($comp_cmd);
- 	if ($?) {
- 	    warn "\nsystem(): $!";
--	    exit $err;
-+	#    exit $err;   https://rt.cpan.org/Public/Bug/Display.html?id=107201
- 	}
- 	unless (`./rlmalloc` !~ /^ok$/ || $?) {
- 	    $extra_defs = $xdef;
diff --git a/dev-perl/WWW-Dict-Leo-Org/files/1.34-umlaut.patch b/dev-perl/WWW-Dict-Leo-Org/files/1.34-umlaut.patch
deleted file mode 100644
index accce925e039..000000000000
--- a/dev-perl/WWW-Dict-Leo-Org/files/1.34-umlaut.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d70ba71c7a0173991cddf9a43b4855864294c203 Mon Sep 17 00:00:00 2001
-From: Slaven Rezic <slaven@rezic.de>
-Date: Fri, 12 Feb 2010 21:47:01 +0100
-Subject: [PATCH] added support for non-iso8859-1 terminals, see
- https://rt.cpan.org/Public/Bug/Display.html?id=35543
-
----
- leo |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/leo b/leo
-index f734249..e65c1b1 100755
---- a/leo
-+++ b/leo
-@@ -58,6 +58,8 @@ sub debug;
- 
- my($o_s, $o_m, $o_c, $o_l, $o_v, $o_h, $o_n, $o_f, $o_d, $o_u, $o_p);
- 
-+isatty(1) && eval q{ use open OUT => ':locale'};
-+
- #
- # commandline options
- #
-@@ -95,6 +97,14 @@ if (!$string) {
-   $string = <STDIN>;
-   chomp $string;
- }
-+if (eval { require I18N::Langinfo; require Encode; 1 }) {
-+  my $codeset = I18N::Langinfo::langinfo(I18N::Langinfo::CODESET());
-+  if ($codeset) {
-+    for ($string) {
-+      $_ = Encode::decode($codeset, $_);
-+    }
-+  }
-+}
- 
- #
- # open the config, if any
--- 
-1.6.4.3
-
diff --git a/dev-perl/XML-Parser/XML-Parser-2.410.0-r2.ebuild b/dev-perl/XML-Parser/XML-Parser-2.410.0-r2.ebuild
index 3cbe567c298b..2291b7bc85bf 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.410.0-r2.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.410.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,4 +18,8 @@ RDEPEND=">=dev-libs/expat-1.95.1-r1"
 DEPEND="${RDEPEND}"
 
 SRC_TEST=do
-myconf="EXPATLIBPATH=${EPREFIX}/usr/$(get_libdir) EXPATINCPATH=${EPREFIX}/usr/include"
+
+src_configure() {
+	myconf="EXPATLIBPATH=${EPREFIX}/usr/$(get_libdir) EXPATINCPATH=${EPREFIX}/usr/include"
+	perl-module_src_configure
+}
diff --git a/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
index 90d7815d6913..44f1bcd8036a 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,4 +18,8 @@ RDEPEND=">=dev-libs/expat-1.95.1-r1"
 DEPEND="${RDEPEND}"
 
 SRC_TEST=do
-myconf="EXPATLIBPATH=${EPREFIX}/usr/$(get_libdir) EXPATINCPATH=${EPREFIX}/usr/include"
+
+src_configure() {
+	myconf="EXPATLIBPATH=${EPREFIX}/usr/$(get_libdir) EXPATINCPATH=${EPREFIX}/usr/include"
+	perl-module_src_configure
+}
diff --git a/dev-perl/libwww-perl/files/ca-certs.patch b/dev-perl/libwww-perl/files/ca-certs.patch
deleted file mode 100644
index b0565f0fdba0..000000000000
--- a/dev-perl/libwww-perl/files/ca-certs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-X-Bugs-Gentoo: https://bugs.gentoo.org/358081
---- libwww-perl-6.01/lib/LWP/Protocol/https.pm
-+++ libwww-perl-6.01/lib/LWP/Protocol/https.pm
-@@ -21,25 +21,7 @@
-     }
-     if ($ssl_opts{SSL_verify_mode}) {
- 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
--	    eval {
--		require Mozilla::CA;
--	    };
--	    if ($@) {
--		if ($@ =! /^Can't locate Mozilla\/CA\.pm/) {
--		    $@ = <<'EOT';
--Can't verify SSL peers without knowning which Certificate Authorities to trust
--
--This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
--envirionment variable or by installing the Mozilla::CA module.
--
--To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
--envirionment variable to 0.  If you do this you can't be sure that you
--communicate with the expected peer.
--EOT
--		}
--		die $@;
--	    }
--	    $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
-+	    $ssl_opts{SSL_ca_path} = '/etc/ssl/certs';
- 	}
-     }
-     $self->{ssl_opts} = \%ssl_opts;
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/files/PEAR-Spreadsheet_Excel_Writer-0.9.1-utf8.patch b/dev-php/PEAR-Spreadsheet_Excel_Writer/files/PEAR-Spreadsheet_Excel_Writer-0.9.1-utf8.patch
deleted file mode 100644
index d21d15dbc18d..000000000000
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/files/PEAR-Spreadsheet_Excel_Writer-0.9.1-utf8.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-http://pear.php.net/bugs/bug.php?id=1572
-http://bugs.gentoo.org/show_bug.cgi?id=199675
---- Writer/Workbook.php_orig	2007-11-19 13:58:36.000000000 +0100
-+++ Writer/Workbook.php	2007-11-19 18:10:42.000000000 +0100
-@@ -1311,9 +1311,10 @@
-            8228 : Maximum Excel97 block size
-              -4 : Length of block header
-              -8 : Length of additional SST header information
--         = 8216
-+             -8 : Arbitrary number to keep within _add_continue() limit
-+         = 8208
-         */
--        $continue_limit     = 8216;
-+        $continue_limit     = 8208;
-         $block_length       = 0;
-         $written            = 0;
-         $this->_block_sizes = array();
-@@ -1321,6 +1322,9 @@
- 
-         foreach (array_keys($this->_str_table) as $string) {
-             $string_length = strlen($string);
-+            $headerinfo    = unpack("vlength/Cencoding", $string);
-+            $encoding      = $headerinfo["encoding"];
-+            $split_string  = 0;
- 
-             // Block length is the total length of the strings that will be
-             // written out in a single SST or CONTINUE block.
-@@ -1347,16 +1351,39 @@
-                 boundaries. Therefore, in some cases we need to reduce the
-                 amount of available
-                 */
-+                $align = 0;
-+
-+                // Only applies to Unicode strings
-+                if ($encoding == 1) {
-+                    // Min string + header size -1
-+                    $header_length = 4;
-+
-+                    if ($space_remaining > $header_length) {
-+                        // String contains 3 byte header => split on odd boundary
-+                        if (!$split_string && $space_remaining % 2 != 1) {
-+                            $space_remaining--;
-+                            $align = 1;
-+                        }
-+                        // Split section without header => split on even boundary
-+                        else if ($split_string && $space_remaining % 2 == 1) {
-+                            $space_remaining--;
-+                            $align = 1;
-+                        }
-+
-+                        $split_string = 1;
-+                    }
-+                }
-+
- 
-                 if ($space_remaining > $header_length) {
-                     // Write as much as possible of the string in the current block
-                     $written      += $space_remaining;
- 
-                     // Reduce the current block length by the amount written
--                    $block_length -= $continue_limit - $continue;
-+                    $block_length -= $continue_limit - $continue - $align;
- 
-                     // Store the max size for this block
--                    $this->_block_sizes[] = $continue_limit;
-+                    $this->_block_sizes[] = $continue_limit - $align;
- 
-                     // If the current string was split then the next CONTINUE block
-                     // should have the string continue flag (grbit) set unless the
-@@ -1398,13 +1425,19 @@
-          This length is required to set the offsets in the BOUNDSHEET records since
-          they must be written before the SST records
-         */
--        $total_offset = array_sum($this->_block_sizes);
--        // SST information
--        $total_offset += 8;
--        if (!empty($this->_block_sizes)) {
--            $total_offset += (count($this->_block_sizes)) * 4; // add CONTINUE headers
-+
-+        $tmp_block_sizes = array();
-+        $tmp_block_sizes = $this->_block_sizes;
-+
-+        $length  = 12;
-+        if (!empty($tmp_block_sizes)) {
-+            $length += array_shift($tmp_block_sizes); // SST information
-         }
--        return $total_offset;
-+        while (!empty($tmp_block_sizes)) {
-+            $length += 4 + array_shift($tmp_block_sizes); // add CONTINUE headers
-+        }
-+
-+        return $length;
-     }
- 
-     /**
-@@ -1421,9 +1454,30 @@
-     function _storeSharedStringsTable()
-     {
-         $record  = 0x00fc;  // Record identifier
-+        $length  = 0x0008;  // Number of bytes to follow
-+        $total   = 0x0000;
-+
-+        // Iterate through the strings to calculate the CONTINUE block sizes
-+        $continue_limit = 8208;
-+        $block_length   = 0;
-+        $written        = 0;
-+        $continue       = 0;
-+
-         // sizes are upside down
--        $this->_block_sizes = array_reverse($this->_block_sizes);
--        $length = array_pop($this->_block_sizes) + 8; // First block size plus SST information
-+        $tmp_block_sizes = $this->_block_sizes;
-+//        $tmp_block_sizes = array_reverse($this->_block_sizes);
-+
-+        // The SST record is required even if it contains no strings. Thus we will
-+        // always have a length
-+        //
-+        if (!empty($tmp_block_sizes)) {
-+            $length = 8 + array_shift($tmp_block_sizes);
-+        } else {
-+            // No strings
-+            $length = 8;
-+        }
-+
-+
- 
-         // Write the SST block header information
-         $header      = pack("vv", $record, $length);
-@@ -1431,18 +1485,14 @@
-         $this->_append($header . $data);
- 
- 
--        // Iterate through the strings to calculate the CONTINUE block sizes
--        $continue_limit = 8216;
--        $block_length   = 0;
--        $written        = 0;
--        $continue       = 0;
- 
- 
-         /* TODO: not good for performance */
-         foreach (array_keys($this->_str_table) as $string) {
- 
-             $string_length = strlen($string);
--            $encoding      = 0; // assume there are no Unicode strings
-+            $headerinfo    = unpack("vlength/Cencoding", $string);
-+            $encoding      = $headerinfo["encoding"];
-             $split_string  = 0;
- 
-             // Block length is the total length of the strings that will be
-@@ -1473,6 +1523,30 @@
- 
-                 // Unicode data should only be split on char (2 byte) boundaries.
-                 // Therefore, in some cases we need to reduce the amount of available
-+                // space by 1 byte to ensure the correct alignment.
-+                $align = 0;
-+
-+                // Only applies to Unicode strings
-+                if ($encoding == 1) {
-+                    // Min string + header size -1
-+                    $header_length = 4;
-+
-+                    if ($space_remaining > $header_length) {
-+                        // String contains 3 byte header => split on odd boundary
-+                        if (!$split_string && $space_remaining % 2 != 1) {
-+                            $space_remaining--;
-+                            $align = 1;
-+                        }
-+                        // Split section without header => split on even boundary
-+                        else if ($split_string && $space_remaining % 2 == 1) {
-+                            $space_remaining--;
-+                            $align = 1;
-+                        }
-+
-+                        $split_string = 1;
-+                    }
-+                }
-+
- 
-                 if ($space_remaining > $header_length) {
-                     // Write as much as possible of the string in the current block
-@@ -1483,7 +1557,7 @@
-                     $string = substr($string, $space_remaining);
- 
-                     // Reduce the current block length by the amount written
--                    $block_length -= $continue_limit - $continue;
-+                    $block_length -= $continue_limit - $continue - $align;
- 
-                     // If the current string was split then the next CONTINUE block
-                     // should have the string continue flag (grbit) set unless the
-@@ -1503,7 +1577,7 @@
-                 // Write the CONTINUE block header
-                 if (!empty($this->_block_sizes)) {
-                     $record  = 0x003C;
--                    $length  = array_pop($this->_block_sizes);
-+                    $length  = array_shift($tmp_block_sizes);
-                     $header  = pack('vv', $record, $length);
-                     if ($continue) {
-                         $header .= pack('C', $encoding);
-
diff --git a/dev-php/pecl-imagick/files/remove-header-check.patch b/dev-php/pecl-imagick/files/remove-header-check.patch
deleted file mode 100644
index 94fbf472d1fb..000000000000
--- a/dev-php/pecl-imagick/files/remove-header-check.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config.m4	2012-05-30 22:21:12.000000000 +0200
-+++ config.m4	2013-04-17 11:47:27.753015522 +0200
-@@ -50,13 +50,6 @@
-   		AC_MSG_ERROR(Cannot locate header file magick-wand.h)
-     fi	
-   else	
--    AC_MSG_CHECKING(for MagickWand.h header file)
--
--    if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
--      AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
--    else
--      AC_MSG_ERROR(Cannot locate header file MagickWand.h)
--    fi
-     AC_DEFINE(IMAGICK_USE_NEW_HEADER,1,[ ])
-     PHP_IMAGICK_USE_NEW_HEADER=1
-   fi
diff --git a/dev-php/pecl-radius/files/radius_long.patch b/dev-php/pecl-radius/files/radius_long.patch
deleted file mode 100644
index 090674c4f189..000000000000
--- a/dev-php/pecl-radius/files/radius_long.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gentoo bug: 460836
-Upstream bug: 60885
-
-diff -u php-radius-1.2.5/radius-1.2.5/radius.c php-radius-1.2.5/radius-1.2.5/radius.c
---- php-radius-1.2.5/radius-1.2.5/radius.c
-+++ php-radius-1.2.5/radius-1.2.5/radius.c
-@@ -265,7 +265,7 @@
- /* {{{ proto bool radius_create_request(desc, code) */
- PHP_FUNCTION(radius_create_request)
- {
--	int code;
-+	long code;
- 	radius_descriptor *raddesc;
- 	zval *z_radh;
- 
diff --git a/dev-php/suhosin/files/suhosin-0.9.37.1-libcrypt.patch b/dev-php/suhosin/files/suhosin-0.9.37.1-libcrypt.patch
deleted file mode 100644
index 02b5aba1af2b..000000000000
--- a/dev-php/suhosin/files/suhosin-0.9.37.1-libcrypt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: suhosin-0.9.32.1/config.m4
-===================================================================
---- suhosin-0.9.33.orig/config.m4
-+++ suhosin-0.9.33/config.m4
-@@ -6,4 +6,7 @@ PHP_ARG_ENABLE(suhosin, whether to enabl
- 
- if test "$PHP_SUHOSIN" != "no"; then
-   PHP_NEW_EXTENSION(suhosin, suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867.c rfc1867_new.c log.c header.c execute.c ex_imp.c session.c aes.c crypt.c, $ext_shared)
-+  PHP_CHECK_LIBRARY(crypt, crypt,
-+    [PHP_ADD_LIBRARY(crypt,, SUHOSIN_SHARED_LIBADD)])
-+  PHP_SUBST(SUHOSIN_SHARED_LIBADD)
- fi
diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
index c33169d66f42..1fdf04d1881f 100644
--- a/dev-python/Numdifftools/Manifest
+++ b/dev-python/Numdifftools/Manifest
@@ -1,4 +1,4 @@
-DIST Numdifftools-0.9.16.tar.gz 334688 SHA256 74c2dfb393ff10af724ed8e1871e1bf14c643f911c3e6f33efd01d3228041d3f SHA512 b5056a26408eda09466795ce6f24f1549a389294d9d98cd9ce437a6f9f875cc58e59b5f4ffa7452e4cce2ac9f4813523e25eff63f597a674edab6ee777fbbfc3 WHIRLPOOL 1f91f3cc4b9d8e10e4ec9f4207a0c434bf376847432f7ba2d3f05038853aeedab5a0d13a07cc846244c3849a8ad527ccad0b994e81b8444296772ce20aa9bccd
 DIST numdifftools-0.9.12.zip 236823 SHA256 eee07f03eaa9531c34949bfbb27b0fade7b1e927dd9daf18342d13fc1ee88eaa SHA512 00c78abac0c08beb72ec11bcddd74165db773a0fa9b4eee10290a27c4c143f1593254e058898dc12aee1afc6bad5bb2849451e6018129aa32e808eee1b97420c WHIRLPOOL aef074b9aaf4caecfad8bff75ccb8bd95e36373e2dd4e1dfc4b700fa1925b9b8652d6c483f81133c82e857abae6f2628e9166c77d6b102db3f9bb58c72e682a7
 DIST numdifftools-0.9.13.zip 225820 SHA256 1aad0d9eba96846f5c3b82e6a8df0b1eaf4cd13e0b665cba64646756a0f2add6 SHA512 e16fe167cbcc7995e5f7b1784822b94bc82261821ebf35f8b9f774ef1fd601ef13a23a72670f28b54b5f288b509a9ffccbde09033bdec6a88e8a4ef78ed74b25 WHIRLPOOL f32e93f54a883a751f0efb987b81fc7f187c8b6e4c327de2166f4c30afb7f3cb1b076047036deced7b98b551cb9085483c2e22a08881a7730689a5bbbfae5926
 DIST numdifftools-0.9.14.zip 350053 SHA256 8b17629fa9877f19517014095b12d7145f8cd5d9568421e202d777c97d9f04e4 SHA512 a69c878a31fa96c0b3f65c486ac75359242b6215868f24f3554be9ca104ac477bc786df7046bc830120d8fabbc475de40ab3db77c21c0d54756ccec1829fd8ae WHIRLPOOL b890871115d2f4ab65450272a8ec14e36f3379a6cbb2783bb9257e94e5b627a1cc0fc90b1a801f3655eba7ef4ac76b9690ad2ca41a9cf2f9e5b1e8ce20c11625
+DIST numdifftools-0.9.17.zip 363422 SHA256 5583260d77fe58f719077bb15098e70aba344e4d88eb77c8103ec9587ae15a92 SHA512 acef3865861c76f0850b6f1c5ca5633f695603a7458c79569bbe887404c8490845d935693c57ea18468fe3cb7f864fe5481285f731dc933b6c0b521e3b888328 WHIRLPOOL 1431ae67c54e9f3adb2920f0cc50e85d7e9a03f0e60d73c629e4e04cf5c8509d66270b00a14fb903d5be65eb484399abb21b44220caf073d20e4397ee17a9897
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.16.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
similarity index 81%
rename from dev-python/Numdifftools/Numdifftools-0.9.16.ebuild
rename to dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
index 9764682c03a4..508152df2590 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.16.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
 HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
-SRC_URI="https://github.com/pbrod/${PN,,}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
 
 SLOT="0"
 LICENSE="BSD"
@@ -44,12 +44,6 @@ python_prepare_all() {
 	sed \
 		-e '/tests_require/d' \
 		-i setup.py || die
-	# Upstream does not create proper tarballs anymore,
-	# and setuptools reacts allergically to Github tarballs
-	cat >> PKG-INFO <<-EOF || die
-		Name: ${PN,,}
-		Version: ${PV}
-	EOF
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 556dd2d399c8..2de2225072d4 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,2 +1 @@
-DIST PyECLib-1.0.7.tar.gz 8376329 SHA256 f2136f187900fe3b84c75fea671c9bcb3d4d4a6307e44d9f960ed8296ce52dc3 SHA512 8f1bbf6bd0c8ceb62862337fd204e497e5826e01c8b7532bd68485b2203e755144d0ac6b7ee9aa59fb290e8c9ee5fa3bd865203dbbdbf471e0112d10c3ea8720 WHIRLPOOL 62839fe028fc5a5d96005f337425773254d1fb287d4e2d02010ca9e1fb3df6e79f7a7fc4e03797d854b8965c24665dd93010623cf7bae8a5612b1c2e50513e80
 DIST PyECLib-1.2.0.tar.gz 6677880 SHA256 0f55656b4288fef1cc85978ebb8eef2e83515482f68bb1cf19903c048c9f8c9b SHA512 6413b8f48e05d96bf43d25640d68941aa17a938fba18f0fc7847e51ac75b222eeb6678ae49eba2a582220d55e253f60a1802b175134d1e138764ac1d15b5d88e WHIRLPOOL d9f14894bec43b97cbcd4bdd0f3f1cc871e8241a4c126fa5b6a3fa83e95da39cda16812e38fea815a21d318f4313c0981a019c2c3d6c874dea82122f6a359ff3
diff --git a/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild b/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild
deleted file mode 100644
index e933c5439f62..000000000000
--- a/dev-python/PyECLib/PyECLib-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
-	${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/PyECLib-usr-local2.patch"
-)
diff --git a/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch b/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch
deleted file mode 100644
index 9f12a56cf19a..000000000000
--- a/dev-python/PyECLib/files/1.0.7-erasurecode_locations.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py	2015-04-15 18:13:08.000000000 -0500
-+++ setup.py.new	2015-08-04 20:36:06.236656803 -0500
-@@ -66,7 +66,7 @@
- default_include_paths = [default_python_incdir,
-                          '/usr/local/include', '/usr/local/include/jerasure',
-                          '/usr/include', 'src/c/pyeclib_c',
--                         '/usr/local/include']
-+                         '/usr/include/liberasurecode', '/usr/local/include']
- 
- libflags = ''
- includeflags = ''
diff --git a/dev-python/PyECLib/files/PyECLib-usr-local.patch b/dev-python/PyECLib/files/PyECLib-usr-local.patch
deleted file mode 100644
index 2d923b226cdd..000000000000
--- a/dev-python/PyECLib/files/PyECLib-usr-local.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- setup.py	2015-08-26 16:11:51.163684633 -0500
-+++ setup.py.new	2015-08-26 16:14:24.203682415 -0500
-@@ -55,18 +55,16 @@
- # and Tushar) cannot explain what is going on with
- # distutils or libtool here.
- #
--standard_library_paths = [('%s/usr/local/lib' % _exec_prefix),
--                          '/lib', '/usr/lib', '/usr/local/lib']
-+standard_library_paths = [('%s/usr/lib' % _exec_prefix),
-+                          '/lib', '/usr/lib']
- 
- default_library_paths = [default_python_libdir,
--                         ('%s/usr/local/lib' % _exec_prefix),
--                         '/lib', '/usr/lib', '/usr/local/lib',
--                         'src/c/liberasurecode-1.0.7/src/.libs']
-+                         ('%s/usr/lib' % _exec_prefix),
-+                         '/lib', '/usr/lib']
- 
- default_include_paths = [default_python_incdir,
--                         '/usr/local/include', '/usr/local/include/jerasure',
--                         '/usr/include', 'src/c/pyeclib_c',
--                         '/usr/include/liberasurecode', '/usr/local/include']
-+                         '/usr/include', '/usr/include/jerasure', 'src/c/pyeclib_c',
-+                         '/usr/include', '/usr/include/liberasurecode']
- 
- libflags = ''
- includeflags = ''
-@@ -131,8 +129,9 @@
-         if (os.path.isdir(locallibsrcdir)):
-             # patch default include, lib paths
-             topdir = os.getcwd()
--            libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
--                        (topdir + "/" + locallibsrcdir + "/src/.libs ")] 
-+            libdirs = []
-+            libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
-+                        (topdir + "/" + locallibsrcdir + "/src/.libs ")] 
-             for d in libdirs:
-                 libflags = libflags + " -L" + d
-                 default_library_paths.append(d)
-@@ -148,7 +147,7 @@
-             statefile = "." + library + "_configured"
-             if (not os.path.isfile(statefile)):
-                 configure_cmd = ("CFLAGS=\"%s\" LDFLAGS=\"%s\" " % (includeflags, libflags))
--                configure_cmd = ("%s ./configure --prefix=%s/usr/local" % \
-+                configure_cmd = ("%s ./configure --prefix=%s/usr" % \
-                     (configure_cmd, installroot))
-                 print(configure_cmd)
-                 retval = os.system(configure_cmd)
-@@ -218,7 +217,7 @@
-                        "http://lab.jerasure.org/jerasure/jerasure.git",
-                        "install", self.distribution)
-         installroot = _get_installroot(self.distribution)
--        default_library_paths.insert(0, "%s/usr/local/lib" % installroot)
-+        default_library_paths.insert(0, "%s/usr/lib" % installroot)
-         _install.run(self)
- 
-         # Another Mac-ism...  If the libraries are installed
-@@ -231,13 +230,13 @@
-         print("***************************************************")
-         print("**                                                 ")
-         print("** PyECLib libraries have been installed to:       ")
--        print("**   %susr/local/lib" % installroot)
-+        print("**   %susr/lib" % installroot)
-         print("**                                                 ")
-         print("** Any user using this library must update:        ")
-         print("**   %s" % ldpath_str)
-         print("**                                                 ")
-         print("** Run 'ldconfig' or place this line:              ")
--        print("**   export %s=%s" % (ldpath_str, "%susr/local/lib"
-+        print("**   export %s=%s" % (ldpath_str, "%susr/lib"
-                                      % installroot))
-         print("**                                                 ")
-         print("** into .bashrc, .profile, or the appropriate shell")
-@@ -256,8 +255,7 @@
-                    libraries=['erasurecode'],
-                    # The extra arguments are for debugging
-                    # extra_compile_args=['-g', '-O0'],
--                   extra_link_args=['-Wl,-rpath,%s' %
--                                    l for l in default_library_paths],
-+                   extra_link_args=[],
-                    sources=['src/c/pyeclib_c/pyeclib_c.c'])
- 
- setup(name='PyECLib',
diff --git a/dev-python/PyECLib/files/PyECLib-usr-local2.patch b/dev-python/PyECLib/files/PyECLib-usr-local2.patch
deleted file mode 100644
index c0b23d477416..000000000000
--- a/dev-python/PyECLib/files/PyECLib-usr-local2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- setup.py	2015-08-27 14:33:44.643517647 -0500
-+++ setup.py.new	2015-08-27 14:34:05.202517349 -0500
-@@ -60,13 +60,12 @@
- 
- default_library_paths = [default_python_libdir,
-                          ('%s/usr/local/lib' % _exec_prefix),
--                         '/lib', '/usr/lib', '/usr/local/lib',
--                         'src/c/liberasurecode-1.0.7/src/.libs']
-+                         '/lib', '/usr/lib', '/usr/local/lib']
- 
- default_include_paths = [default_python_incdir,
-                          '/usr/local/include', '/usr/local/include/jerasure',
-                          '/usr/include', 'src/c/pyeclib_c',
--                         '/usr/local/include']
-+                         '/usr/include/liberasurecode', '/usr/local/include']
- 
- libflags = ''
- includeflags = ''
-@@ -120,6 +119,7 @@
-         if (os.path.isfile(library_file_path)):
-             missing = False
-             break
-+    missing = False
-     if missing:
-         # try using an integrated copy of the library
-         srcpath = "src/c/"
-@@ -228,24 +228,6 @@
-             ldpath_str = "DYLD_LIBRARY_PATH"
-         else:
-             ldpath_str = "LD_LIBRARY_PATH"
--        print("***************************************************")
--        print("**                                                 ")
--        print("** PyECLib libraries have been installed to:       ")
--        print("**   %susr/local/lib" % installroot)
--        print("**                                                 ")
--        print("** Any user using this library must update:        ")
--        print("**   %s" % ldpath_str)
--        print("**                                                 ")
--        print("** Run 'ldconfig' or place this line:              ")
--        print("**   export %s=%s" % (ldpath_str, "%susr/local/lib"
--                                     % installroot))
--        print("**                                                 ")
--        print("** into .bashrc, .profile, or the appropriate shell")
--        print("** start-up script!  Also look at ldconfig(8) man  ")
--        print("** page for a more static LD configuration         ")
--        print("**                                                 ")
--        print("***************************************************")
--
- 
- module = Extension('pyeclib_c',
-                    define_macros=[('MAJOR VERSION', '0'),
diff --git a/dev-python/apptools/files/apptools_test.patch b/dev-python/apptools/files/apptools_test.patch
deleted file mode 100644
index ce2d688346ba..000000000000
--- a/dev-python/apptools/files/apptools_test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Disable test that use package installed in ${ROOT}
-
-https://bugs.gentoo.org/show_bug.cgi?id=429668
-
-Patch written by Ian Delaney <johneed@hotmail.com>
---- apptools/persistence/tests/check_version_registry.py
-+++ apptools/persistence/tests/check_version_registry.py
-@@ -39,6 +39,7 @@
- 
- 
- class TestVersionRegistry(unittest.TestCase):
-+    @unittest.skip("This tests uses installed version")
-     def test_get_version(self):
-         """Test the get_version function."""
-         c = Classic()
diff --git a/dev-python/async/files/async-0.6.1_libz_link.patch b/dev-python/async/files/async-0.6.1_libz_link.patch
deleted file mode 100644
index a7031cfa93af..000000000000
--- a/dev-python/async/files/async-0.6.1_libz_link.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-#Patch by Jesus Rivero <neurogeek@gentoo.org>
-#Submitted to upstream Ago 26, 2011
-diff -uNr async-0.6.1.orig/setup.py async-0.6.1/setup.py
---- async-0.6.1.orig/setup.py	2010-11-21 07:03:47.000000000 -0500
-+++ async-0.6.1/setup.py	2011-08-26 16:51:57.000000000 -0400
-@@ -77,7 +77,7 @@
-       packages = ('async', 'async.mod', 'async.test', 'async.test.mod'),
-       package_data={'async' : ['AUTHORS', 'README']},
-       package_dir = {'async':''},
--      ext_modules=[Extension('async.mod.zlib', ['mod/zlibmodule.c'])],
-+      ext_modules=[Extension('async.mod.zlib', ['mod/zlibmodule.c'], libraries=['z'])],
-       license = "BSD License",
-       zip_safe=False,
-       long_description = """Async is a framework to process interdependent tasks in a pool of workers"""
diff --git a/dev-python/autopep8/files/autopep8-0.5.2-issue-10.patch b/dev-python/autopep8/files/autopep8-0.5.2-issue-10.patch
deleted file mode 100644
index 5bd6c95ed177..000000000000
--- a/dev-python/autopep8/files/autopep8-0.5.2-issue-10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bec4e89cb339beb824541b0b88dda4ea1742835f Mon Sep 17 00:00:00 2001
-From: myint <myint@macbookpro.local>
-Date: Fri, 4 May 2012 06:09:22 -0700
-Subject: [PATCH] Correct fix_e224() to not modify indentation
-
----
- autopep8.py |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/autopep8.py b/autopep8.py
-index c795cf3..c7ca42c 100755
---- a/autopep8.py
-+++ b/autopep8.py
-@@ -230,7 +230,10 @@ class FixPEP8(object):
- 
-     def fix_e224(self, result):
-         target = self.source[result['line'] - 1]
--        fixed = re.sub(r'\t+', ' ', target, 1)
-+        offset = result['column']
-+        prefix = target[:offset - 1]
-+        suffix = target[offset - 1:].replace('\t', ' ')
-+        fixed = prefix + " " + suffix
-         self.source[result['line'] - 1] = fixed
- 
-     def fix_e225(self, result):
--- 
-1.7.8.5
-
diff --git a/dev-python/behave/behave-1.2.5-r1.ebuild b/dev-python/behave/behave-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..664edfc22af8
--- /dev/null
+++ b/dev-python/behave/behave-1.2.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="behaviour-driven development, Python style"
+HOMEPAGE="https://github.com/behave/behave"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/parse-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/parse-type-0.3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-cheeseshop-0.2[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3[${PYTHON_USEDEP}]
+		>=dev-python/pyhamcrest-1.8[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "nosetests failed under ${EPYTHON}"
+
+	${PYTHON} -m behave --tags='~@xfail' features/ || die "behave features failed under ${EPYTHON}"
+	${PYTHON} -m behave --tags='~@xfail' tools/test-features/ || die "behave test-festures failed under ${EPYTHON}"
+	${PYTHON} -m behave --tags='~@xfail' issue.features/ || die "behave issue.features failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/docs/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 9fd19aaac356..21d92f6dbc98 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,3 @@
-DIST botocore-1.4.46.tar.gz 2713844 SHA256 844dbd090b4127678c25342635485c87d86bca4a4f8a7c2295d715f7c830700c SHA512 f79c309ca2bc7fd8d7c2ae63b3968d7212c16d113a17fbb06938f6aeae13b92bc1645aae19258f60e61b10e9ec09868582b20fa5fc4f55a71047433b60de05be WHIRLPOOL 0d84058c1a7dcdaddcb7c2cff4c4f2a1ebe39a8db8358bfb23a50e8dbd8cebd2f30a721573d3f10e241f29e56bf82b72327fcfa17d84f423a091a23a3acc6e40
 DIST botocore-1.4.48.tar.gz 2728910 SHA256 167babd5eb74cf44f9f71422376be94ce4e731e5e785ea2f87bbf1978a258bc8 SHA512 73c66b3931ce5f2978546dc91ce808ed92484b6c609fc3f46fedd3a670ba3ec36f506b709c4baa2a9f3daad1e644730f93416f575afdccf4874664a4388e136e WHIRLPOOL b45e068e81cd37efbb69baaa29bc2adebbcecdd49554b89265a5e7c5b02ee6e96005a66ddfe2357df1d8cb1afd22f7a7e2f54607b563e674736f0de8fb5a4d04
 DIST botocore-1.4.49.tar.gz 2720919 SHA256 c7804efb622f340593ae49cc552481f2820de2088199a0010d469cf0dfb94731 SHA512 677d79bcd3cc13aba62693294952542588e016682a0e682cbf6b4035ea202abaf0b805664ae8c6b599df2f29f180ce48631286c9a8745ae7003b1858eda84259 WHIRLPOOL 3e5890f8ac15ae4db3e48d5f4c049eccf4de45e0a805988f5492a6b103faa64d636ec9113f4949523dc7706ed45ab0004481111b63821985da946b5eadc0e1cc
+DIST botocore-1.4.51.tar.gz 2753035 SHA256 e6216bf77f23c49eaae9fff4ad3903af2fbff0de92d2d730d8ca83447be33ad9 SHA512 80849c9eae2d700751258cc8dcf099a8bb8210c0f8f92f2daf53125879b91b7934f56fe98afdac38a92997fb9cb1584d3e188866508514758d4b587d9c1913cb WHIRLPOOL d0014eb9c10215dd4fbaab220a7a9db308dbb6c19857738c650a479591d5d63da4abed95d2c2708f8a92cd7f438c0518ed5216dcfa3332b94abe3fd3050d59df
diff --git a/dev-python/botocore/botocore-1.4.46.ebuild b/dev-python/botocore/botocore-1.4.51.ebuild
similarity index 100%
rename from dev-python/botocore/botocore-1.4.46.ebuild
rename to dev-python/botocore/botocore-1.4.51.ebuild
diff --git a/dev-python/celery/files/celery-3.0.11-require-python-dateutil-2.1.patch b/dev-python/celery/files/celery-3.0.11-require-python-dateutil-2.1.patch
deleted file mode 100644
index 90cdcb6d5f1c..000000000000
--- a/dev-python/celery/files/celery-3.0.11-require-python-dateutil-2.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ae721b6947e7e05f26dc8438fe61106b5e993e12 Mon Sep 17 00:00:00 2001
-From: Ask Solem <ask@celeryproject.org>
-Date: Fri, 17 Aug 2012 16:16:08 +0100
-Subject: [PATCH] Now depends on dateutil-2.1 which supports Py2.6, 2.7 and
- 3.2+. Closes #915
-
----
- requirements/default-py3k.txt |    2 +-
- requirements/default.txt      |    2 +-
- setup.cfg                     |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/requirements/default-py3k.txt b/requirements/default-py3k.txt
-index d68a7bd..a8bd31f 100644
---- a/requirements/default-py3k.txt
-+++ b/requirements/default-py3k.txt
-@@ -1,4 +1,4 @@
- billiard>=2.7.3.17
--python-dateutil>=2.0
-+python-dateutil>=2.1
- pytz
- kombu>=2.4.7,<3.0
-diff --git a/requirements/default.txt b/requirements/default.txt
-index 2f50735..855cfc7 100644
---- a/requirements/default.txt
-+++ b/requirements/default.txt
-@@ -1,3 +1,3 @@
- billiard>=2.7.3.17
--python-dateutil>=1.5,<2.0
-+python-dateutil>=2.1
- kombu>=2.4.7,<3.0
-diff --git a/setup.cfg b/setup.cfg
-index 0e537f8..5ac1409 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -15,7 +15,7 @@
- 
- [bdist_rpm]
- requires = billiard>=2.7.3.17
--	python-dateutil >= 1.5
-+	python-dateutil >= 2.1
- 	kombu >= 2.4.7
- 
- [egg_info]
--- 
-1.7.10
-
diff --git a/dev-python/celery/files/celery-3.0.12-require-python-dateutil-2.1.patch b/dev-python/celery/files/celery-3.0.12-require-python-dateutil-2.1.patch
deleted file mode 100644
index 6df08727d125..000000000000
--- a/dev-python/celery/files/celery-3.0.12-require-python-dateutil-2.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ae721b6947e7e05f26dc8438fe61106b5e993e12 Mon Sep 17 00:00:00 2001
-From: Ask Solem <ask@celeryproject.org>
-Date: Fri, 17 Aug 2012 16:16:08 +0100
-Subject: [PATCH] Now depends on dateutil-2.1 which supports Py2.6, 2.7 and
- 3.2+. Closes #915
-
----
- requirements/default-py3k.txt |    2 +-
- requirements/default.txt      |    2 +-
- setup.cfg                     |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/requirements/default-py3k.txt b/requirements/default-py3k.txt
-index d68a7bd..a8bd31f 100644
---- a/requirements/default-py3k.txt
-+++ b/requirements/default-py3k.txt
-@@ -1,4 +1,4 @@
- billiard>=2.7.3.17
--python-dateutil>=2.0
-+python-dateutil>=2.1
- pytz
- kombu>=2.4.7,<3.0
-diff --git a/requirements/default.txt b/requirements/default.txt
-index 2f50735..855cfc7 100644
---- a/requirements/default.txt
-+++ b/requirements/default.txt
-@@ -1,3 +1,3 @@
- billiard>=2.7.3.17
--python-dateutil>=1.5,<2.0
-+python-dateutil>=2.1
- kombu>=2.4.7,<3.0
-diff --git a/setup.cfg b/setup.cfg
-index 0e537f8..5ac1409 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -15,7 +15,7 @@
- 
- [bdist_rpm]
- requires = billiard >= 2.7.3.18
--	python-dateutil >= 1.5
-+	python-dateutil >= 2.1
- 	kombu >= 2.4.8
- 
- [egg_info]
--- 
-1.7.10
-
diff --git a/dev-python/celery/files/celery-3.1.10-test.patch b/dev-python/celery/files/celery-3.1.10-test.patch
deleted file mode 100644
index 94fcac92fbf3..000000000000
--- a/dev-python/celery/files/celery-3.1.10-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff
-diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py
-index f7546d3..a32d9ed 100644
---- a/celery/tests/backends/test_mongodb.py
-+++ b/celery/tests/backends/test_mongodb.py
-@@ -196,9 +196,10 @@ def test_get_task_meta_for(self, mock_get_database):
-         mock_get_database.assert_called_once_with()
-         mock_database.__getitem__.assert_called_once_with(MONGODB_COLLECTION)
-         self.assertEqual(
--            ['status', 'task_id', 'date_done', 'traceback', 'result',
--             'children'],
--            list(ret_val.keys()))
-+            list(sorted(['status', 'task_id', 'date_done', 'traceback',
-+                         'result', 'children'])),
-+            list(sorted(ret_val.keys())),
-+        )
- 
-     @patch('celery.backends.mongodb.MongoBackend._get_database')
-     def test_get_task_meta_for_no_result(self, mock_get_database):
-@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database):
-         mock_collection.find_one.assert_called_once_with(
-             {'_id': sentinel.taskset_id})
-         self.assertEqual(
--            ['date_done', 'result', 'task_id'],
--            list(ret_val.keys()),
-+            list(sorted(['date_done', 'result', 'task_id'])),
-+            list(sorted(ret_val.keys())),
-         )
- 
-     @patch('celery.backends.mongodb.MongoBackend._get_database')
-#diff -ur celery-3.1.10.orig/celery/tests/backends/test_mongodb.py celery-3.1.10/celery/tests/backends/test_mongodb.py
-#--- celery-3.1.10.orig/celery/tests/backends/test_mongodb.py	2014-02-28 21:43:26.000000000 +0800
-#+++ celery-3.1.10/celery/tests/backends/test_mongodb.py	2014-04-17 11:43:00.818430253 +0800
diff --git a/dev-python/cffi/files/cffi-1.1.0-test-backport.patch b/dev-python/cffi/files/cffi-1.1.0-test-backport.patch
deleted file mode 100644
index 2609e333991e..000000000000
--- a/dev-python/cffi/files/cffi-1.1.0-test-backport.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# HG changeset patch
-# User Armin Rigo <arigo@tunes.org>
-# Date 1433182838 -7200
-# Node ID 34d5fd98bc84d202dd6692906f21509bb5abefaf
-# Parent  feea0af4a450e0ff0045f1b7c0a5f430c97520f9
-Issue #204: second try
-
-diff --git a/testing/cffi1/test_zdist.py b/testing/cffi1/test_zdist.py
---- a/testing/cffi1/test_zdist.py
-+++ b/testing/cffi1/test_zdist.py
-@@ -29,13 +29,17 @@
-         if hasattr(self, 'saved_cwd'):
-             os.chdir(self.saved_cwd)
- 
--    def run(self, args):
-+    def run(self, args, cwd=None):
-         env = os.environ.copy()
--        newpath = self.rootdir
--        if 'PYTHONPATH' in env:
--            newpath += os.pathsep + env['PYTHONPATH']
--        env['PYTHONPATH'] = newpath
--        subprocess.check_call([self.executable] + args, env=env)
-+        # a horrible hack to prevent distutils from finding ~/.pydistutils.cfg
-+        # (there is the --no-user-cfg option, but not in Python 2.6...)
-+        env['HOME'] = '/this/path/does/not/exist'
-+        if cwd is None:
-+            newpath = self.rootdir
-+            if 'PYTHONPATH' in env:
-+                newpath += os.pathsep + env['PYTHONPATH']
-+            env['PYTHONPATH'] = newpath
-+        subprocess.check_call([self.executable] + args, cwd=cwd, env=env)
- 
-     def _prepare_setuptools(self):
-         if hasattr(TestDist, '_setuptools_ready'):
-@@ -44,8 +48,7 @@
-             import setuptools
-         except ImportError:
-             py.test.skip("setuptools not found")
--        subprocess.check_call([self.executable, 'setup.py', 'egg_info'],
--                              cwd=self.rootdir)
-+        self.run(['setup.py', 'egg_info'], cwd=self.rootdir)
-         TestDist._setuptools_ready = True
- 
-     def check_produced_files(self, content, curdir=None):
diff --git a/dev-python/cffi/files/issue177_prot_exec.patch b/dev-python/cffi/files/issue177_prot_exec.patch
deleted file mode 100644
index 8dbcf07c0052..000000000000
--- a/dev-python/cffi/files/issue177_prot_exec.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# HG changeset patch
-# User Armin Rigo <arigo@tunes.org>
-# Date 1424942568 -3600
-# Node ID c7edb1e84eb3c29cac0674790cb4efcbcf1683b2
-# Parent  95e0563201602a2e1a8d83cc95a6a70048dfeece
-issue #177: workaround for some Linux kernels
-
-diff --git a/c/malloc_closure.h b/c/malloc_closure.h
---- a/c/malloc_closure.h
-+++ b/c/malloc_closure.h
-@@ -14,6 +14,54 @@
- # endif
- #endif
- 
-+/* On PaX enable kernels that have MPROTECT enable we can't use PROT_EXEC.
-+
-+   This is, apparently, an undocumented change to ffi_prep_closure():
-+   depending on the Linux kernel we're running on, we must give it a
-+   mmap that is either PROT_READ|PROT_WRITE|PROT_EXEC or only
-+   PROT_READ|PROT_WRITE.  In the latter case, just trying to obtain a
-+   mmap with PROT_READ|PROT_WRITE|PROT_EXEC would kill our process(!),
-+   but in that situation libffi is fine with only PROT_READ|PROT_WRITE.
-+   There is nothing in the libffi API to know that, though, so we have
-+   to guess by parsing /proc/self/status.  "Meh."
-+ */
-+#ifdef __linux__
-+#include <stdlib.h>
-+
-+static int emutramp_enabled = -1;
-+
-+static int
-+emutramp_enabled_check (void)
-+{
-+    char *buf = NULL;
-+    size_t len = 0;
-+    FILE *f;
-+    int ret;
-+    f = fopen ("/proc/self/status", "r");
-+    if (f == NULL)
-+        return 0;
-+    ret = 0;
-+
-+    while (getline (&buf, &len, f) != -1)
-+        if (!strncmp (buf, "PaX:", 4))
-+            {
-+                char emutramp;
-+                if (sscanf (buf, "%*s %*c%c", &emutramp) == 1)
-+                    ret = (emutramp == 'E');
-+                break;
-+            }
-+    free (buf);
-+    fclose (f);
-+    return ret;
-+}
-+
-+#define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \
-+        : (emutramp_enabled = emutramp_enabled_check ()))
-+#else
-+#define is_emutramp_enabled() 0
-+#endif
-+
-+
- /* 'allocate_num_pages' is dynamically adjusted starting from one
-    page.  It grows by a factor of PAGE_ALLOCATION_GROWTH_RATE.  This is
-    meant to handle both the common case of not needing a lot of pages,
-@@ -77,9 +125,12 @@
-     if (item == NULL)
-         return;
- #else
-+    int prot = PROT_READ | PROT_WRITE | PROT_EXEC;
-+    if (is_emutramp_enabled ())
-+        prot &= ~PROT_EXEC;
-     item = (union mmaped_block *)mmap(NULL,
-                         allocate_num_pages * _pagesize,
--                        PROT_READ | PROT_WRITE | PROT_EXEC,
-+                        prot,
-                         MAP_PRIVATE | MAP_ANONYMOUS,
-                         -1,
-                         0);
diff --git a/dev-python/cgkit/files/cgkit-2.0.0-test.patch b/dev-python/cgkit/files/cgkit-2.0.0-test.patch
deleted file mode 100644
index e5c198415da2..000000000000
--- a/dev-python/cgkit/files/cgkit-2.0.0-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur cgkit-2.0.0alpha9.orig/unittests/test_sequence.py cgkit-2.0.0alpha9/unittests/test_sequence.py
---- unittests/test_sequence.py	2009-08-15 19:37:35.000000000 +0800
-+++ unittests/test_sequence.py	2012-11-07 06:58:07.024791790 +0800
-@@ -594,6 +594,7 @@
-                           ("spam1_5.tif", "foo0006.tif")], list(ong))
- 
- 
-+@unittest.skip("Seeks absent dep 3delight")
- class TestSeqUtils(unittest.TestCase):
-     """Test the sequence utilities.
-     """
diff --git a/dev-python/configparser/configparser-3.5.0.ebuild b/dev-python/configparser/configparser-3.5.0.ebuild
index 2aaa9ef058fd..004d638fe0b7 100644
--- a/dev-python/configparser/configparser-3.5.0.ebuild
+++ b/dev-python/configparser/configparser-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index bf465e7496e0..22f03e2099c8 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,3 +1,4 @@
 DIST cryptography_vectors-1.1.2.tar.gz 25028810 SHA256 a928dff1af28551ae89376d6789a6754af658f89613e7f9e0e491d643f4e1222 SHA512 0416f4c9b43d9a21a808316deaa5532853d04be441b9ab890174c3bbb92c89744b89c3b4ab751699f6c63b56a46b09d6144cdc79d22322669eeaf24f4ba517c5 WHIRLPOOL 08593c9ae6aa61b34c38457e74f2f6286f40a6ebc4c1967ab74f071a0f18cb3ef3a162bbb5de6626f679d70dd062bfc3bab84a4d6432036a6f742a8bc8d6067b
 DIST cryptography_vectors-1.3.1.tar.gz 25820368 SHA256 6bb1f939826b57fa7e7f726f4845e20110d5c9f164d1545a7f768d7ffda08484 SHA512 f45471b1262980d5918206111102ea5909c42e7cb2a5cb71fa4d19686971bbc2cd2b278350170b3bb93fd184edb2ddfa47026fa199bc77c3252762f79e8490c7 WHIRLPOOL 8ba8090da63bf14cd980c72581a1ce0cd710110c3e9f76e73ed6fc5f2f5fd189b638ada52ffe2343e2ae6001fc4ed86dc12edd65a0c74e540e75ae8c63a4d7d7
 DIST cryptography_vectors-1.3.4.tar.gz 25820443 SHA256 4414bce0a3d7f0a3cdbf44da75ae5c7c586fd765c777d99023eb5a3ac58f0196 SHA512 5b93fb7c50b93449ab15f62943f944c352e3a375c3a89f494cdd34c5c317b8d435ca0079a74fc6a924a1fc235e3c9cdf0d50baf0905d6a7d6161c07aecefe3fe WHIRLPOOL ce2589f31bff099ab73bc33ca42a51bbb505f514623197fcfada375d29bb1bc33c6beca5759c57fb925b3ea68a106891e884328c55116487a4c10abfab9c6db9
+DIST cryptography_vectors-1.5.tar.gz 26646302 SHA256 ad19a2b98a475785c3b2ec8a8c9c974e0c48d00db0c23e79d776a2c489ad812d SHA512 f60576e632a18fef93f6e52bb978b5bbd5349cd61941559d4b491cd3fe1b313188d54adcd3e54754a0dedb20666ba60693e926f061d172175db110ba539161e9 WHIRLPOOL 7cd596e3b242ec894bbbb8e9dcf303e6702fbecd1e686f542acfd2a00c8e4f9cb7c00b1b189df91b247a8581416b8a78165f6785020be01138d88eee526be9de
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.5.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.5.ebuild
new file mode 100644
index 000000000000..752c8492a847
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index c38ad3ab9777..a700e3704ce7 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,3 +1,4 @@
 DIST cryptography-1.1.2.tar.gz 349022 SHA256 7f51459f84d670444275e615839f4542c93547a12e938a0a4906dafe5f7de153 SHA512 566e346a76cfd6b1c6afbf64d1fe496770b1ad5f471c42877ad6931a441ab77408815ae066ba3f0450766c86ae9dd10d7a5966321f93a979a4e1ab9e1201371b WHIRLPOOL 9a552e65047c45e19e313e0530031fa282aec51577bcc64f9346f37ac99663db052f7ccc1798532103edffa6e778f9585e937a862a475f6d7bd9140d06bbcf57
 DIST cryptography-1.3.1.tar.gz 383852 SHA256 b4b36175e0f95ddc88435c26dbe3397edce48e2ff5fe41d504cdb3beddcd53e2 SHA512 8b833619d0aec5e6630c8e069e886f6b708b0b3a4f4ca4e37797a24c69be4cacf162f20c068deaecc3222ee0323583582d384e49fa3dbaeaeefc0d7d8c92918a WHIRLPOOL f9e7c75e910699afdf4adc4fb7257135b97c357c967bbca95f332e1f2ed262716ebba6a648427f86a524e75f6ac46aea7f891fe42100c9d7cf8ffcc317fb7905
 DIST cryptography-1.3.4.tar.gz 384109 SHA256 423ff890c01be7c70dbfeaa967eeef5146f1a43a5f810ffdc07b178e48a105a9 SHA512 abbc027433658702d2331282c9f63d99ea2eb42f5cdfe066b2b0ae6d9b86a35e23891716bb2e9e2ca707aa0d38fb69cba22ec5d95d2b9073047444fdae7a9224 WHIRLPOOL 5bd007cfe304620a7237b0f63fbe87ab22bd1cc252941f4815398382122b1c56c5a22e2dc35ce86aba2c2b2d9403de3313bafde23a3695bd26e4eb0f23c9dea9
+DIST cryptography-1.5.tar.gz 400318 SHA256 52f47ec9a57676043f88e3ca133638790b6b71e56e8890d9d7f3ae4fcd75fa24 SHA512 762b313296baf8ec6eb86557a844065022b83a623c7babc374bd63f575085dc845611c385df870050a2633d6b8c6c8399d8470647328b8f2ff44b17937a04756 WHIRLPOOL 8c37b57703961e911c59d0d396c86b83322564506bd80a66b38c068c8e3e018421eeede6a2dda7718b2f134aafc0327b4525eacb9bfa8714c225babed50045ed
diff --git a/dev-python/cryptography/cryptography-1.5.ebuild b/dev-python/cryptography/cryptography-1.5.ebuild
new file mode 100644
index 000000000000..eaee8d2e54b7
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.6-glpk.patch b/dev-python/cvxopt/files/cvxopt-1.1.6-glpk.patch
deleted file mode 100644
index 2887ccd02206..000000000000
--- a/dev-python/cvxopt/files/cvxopt-1.1.6-glpk.patch
+++ /dev/null
@@ -1,889 +0,0 @@
---- src/C/glpk.c.orig	2013-07-31 12:05:27.089955661 -0600
-+++ src/C/glpk.c	2013-07-31 12:13:40.702115730 -0600
-@@ -22,6 +22,8 @@
- #include "cvxopt.h"
- #include "misc.h"
- #include "glpk.h"
-+#include <float.h>
-+#include <limits.h>
- 
- PyDoc_STRVAR(glpk__doc__,
-     "Interface to the simplex and mixed integer LP algorithms in GLPK.\n\n"
-@@ -36,62 +38,15 @@ PyDoc_STRVAR(glpk__doc__,
- 
- static PyObject *glpk_module;
- 
--typedef struct {
--    char  name[20];
--    int   idx;
--    char  type;
--}   param_tuple;
--
--static const param_tuple GLPK_PARAM_LIST[] = {
--    {"LPX_K_MSGLEV",    LPX_K_MSGLEV,   'i'}, 
--    {"LPX_K_SCALE",     LPX_K_SCALE,    'i'},
--    {"LPX_K_DUAL",      LPX_K_DUAL,     'i'},
--    {"LPX_K_PRICE",     LPX_K_PRICE,    'i'},
--    {"LPX_K_RELAX",     LPX_K_RELAX,    'f'},
--    {"LPX_K_TOLBND",    LPX_K_TOLBND,   'f'},
--    {"LPX_K_TOLDJ",     LPX_K_TOLDJ,    'f'},
--    {"LPX_K_TOLPIV",    LPX_K_TOLPIV,   'f'},
--    {"LPX_K_ROUND",     LPX_K_ROUND,    'i'},
--    {"LPX_K_OBJLL",     LPX_K_OBJLL,    'f'},
--    {"LPX_K_OBJUL",     LPX_K_OBJUL,    'f'},
--    {"LPX_K_ITLIM",     LPX_K_ITLIM,    'i'},
--    {"LPX_K_ITCNT",     LPX_K_ITCNT,    'i'}, 
--    {"LPX_K_TMLIM",     LPX_K_TMLIM,    'f'},
--    {"LPX_K_OUTFRQ",    LPX_K_OUTFRQ,   'i'},
--    {"LPX_K_OUTDLY",    LPX_K_OUTDLY,   'f'},
--    {"LPX_K_BRANCH",    LPX_K_BRANCH,   'i'},
--    {"LPX_K_BTRACK",    LPX_K_BTRACK,   'i'},
--    {"LPX_K_TOLINT",    LPX_K_TOLINT,   'f'},
--    {"LPX_K_TOLOBJ",    LPX_K_TOLOBJ,   'f'},
--    {"LPX_K_MPSINFO",   LPX_K_MPSINFO,  'i'},
--    {"LPX_K_MPSOBJ",    LPX_K_MPSOBJ,   'i'},
--    {"LPX_K_MPSORIG",   LPX_K_MPSORIG,  'i'},
--    {"LPX_K_MPSWIDE",   LPX_K_MPSWIDE,  'i'},
--    {"LPX_K_MPSFREE",   LPX_K_MPSFREE,  'i'},
--    {"LPX_K_MPSSKIP",   LPX_K_MPSSKIP,  'i'},
--    {"LPX_K_LPTORIG",   LPX_K_LPTORIG,  'i'},
--    {"LPX_K_PRESOL",    LPX_K_PRESOL,   'i'},
--}; /* 28 paramaters */
--
--
- #if PY_MAJOR_VERSION >= 3
--static int get_param_idx(const char *str, int *idx, char *type)
-+#define PYINT_CHECK(value) PyLong_Check(value)
-+#define PYINT_AS_LONG(value) PyLong_AS_LONG(value)
-+#define PYSTRING_FROMSTRING(str) PyUnicode_FromString(str)
- #else
--static int get_param_idx(char *str, int *idx, char *type)
-+#define PYINT_CHECK(value) PyInt_Check(value)
-+#define PYINT_AS_LONG(value) PyInt_AS_LONG(value)
-+#define PYSTRING_FROMSTRING(str) PyString_FromString(str)
- #endif
--{
--    int i;
--
--    for (i=0; i<28; i++) {
--        if (!strcmp(GLPK_PARAM_LIST[i].name, str)) {
--            *idx =  GLPK_PARAM_LIST[i].idx;
--            *type = GLPK_PARAM_LIST[i].type;
--            return 1;
--        }
--    }
--    return 0;
--}
--
- 
- static char doc_simplex[] =
-     "Solves a linear program using GLPK.\n\n"
-@@ -127,11 +82,12 @@ static PyObject *simplex(PyObject *self,
- {
-     matrix *c, *h, *b=NULL, *x=NULL, *z=NULL, *y=NULL;
-     PyObject *G, *A=NULL, *t=NULL, *param, *key, *value;
--    LPX *lp;
--    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
-+    glp_prob *lp;
-+    glp_smcp smcp;
-+    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL;
-     int_t pos=0;
-     double *a=NULL, val;
--    char param_type, err_str[100]; 
-+    char err_str[100];
- #if PY_MAJOR_VERSION >= 3
-     const char *keystr;
- #else
-@@ -183,18 +139,18 @@ static PyObject *simplex(PyObject *self,
-         return NULL;
-     }
- 
--    lp = lpx_create_prob();
--    lpx_add_rows(lp, m+p);
--    lpx_add_cols(lp, n);
-+    lp = glp_create_prob();
-+    glp_add_rows(lp, m+p);
-+    glp_add_cols(lp, n);
- 
-     for (i=0; i<n; i++){
--        lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
--        lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
-+        glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
-+        glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
-     }
-     for (i=0; i<m; i++)
--        lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
-+        glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
-     for (i=0; i<p; i++)
--        lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
-+        glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
-             MAT_BUFD(b)[i]);
- 
-     nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
-@@ -203,7 +159,7 @@ static PyObject *simplex(PyObject *self,
-     rn = (int *) calloc(nnzmax+1, sizeof(int));
-     cn = (int *) calloc(nnzmax+1, sizeof(int));
-     if (!a || !rn || !cn){
--        free(a);  free(rn);  free(cn);  lpx_delete_prob(lp);
-+        free(a);  free(rn);  free(cn);  glp_delete_prob(lp);
-         return PyErr_NoMemory();
-     }
- 
-@@ -242,84 +198,155 @@ static PyObject *simplex(PyObject *self,
-             nnz++;
-         }
- 
--    lpx_load_matrix(lp, nnz, rn, cn, a);
-+    glp_load_matrix(lp, nnz, rn, cn, a);
-     free(rn);  free(cn);  free(a);
- 
-     if (!(t = PyTuple_New(A ? 4 : 3))){
--        lpx_delete_prob(lp);
-+        glp_delete_prob(lp);
-         return PyErr_NoMemory();
-     }
- 
-     if (!(param = PyObject_GetAttrString(glpk_module, "options"))
-         || !PyDict_Check(param)){
--            lpx_delete_prob(lp);
-+            glp_delete_prob(lp);
-             PyErr_SetString(PyExc_AttributeError,
-                 "missing glpk.options dictionary");
-             return NULL;
-     }
- 
--    while (PyDict_Next(param, &pos, &key, &value))
-+    glp_init_smcp(&smcp);
-+    while (PyDict_Next(param, &pos, &key, &value)){
- #if PY_MAJOR_VERSION >= 3
--        if ((PyUnicode_Check(key)) && 
--            get_param_idx(_PyUnicode_AsString(key), &param_id, 
--            &param_type)){
-+        if (PyUnicode_Check(key)){
-             keystr = _PyUnicode_AsString(key);
- #else
--        if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
--            &param_id, &param_type)){
--#endif
--	    if (param_type == 'i'){
--#if PY_MAJOR_VERSION >= 3
--	        if (!PyLong_Check(value)){
--#else
--	        if (!PyInt_Check(value)){
--#endif
--                    sprintf(err_str, "invalid value for integer "
--                        "GLPK parameter: %-.20s", keystr);
--                    PyErr_SetString(PyExc_ValueError, err_str);
--	            lpx_delete_prob(lp);
--	            Py_DECREF(param);
--                    return NULL;
--	        }
--                if (!strcmp("LPX_K_PRESOL", keystr) &&
--#if PY_MAJOR_VERSION >= 3
--                    PyLong_AS_LONG(value) != 1){
--#else
--                    PyInt_AS_LONG(value) != 1){
-+        if ((keystr = PyString_AsString(key))){
- #endif
-+            if (!strcmp("LPX_K_MSGLEV", keystr)){
-+                switch (PYINT_AS_LONG(value)){
-+                    case 0: smcp.msg_lev = GLP_MSG_OFF; break;
-+                    case 1: smcp.msg_lev = GLP_MSG_ERR; break;
-+                    case 2: smcp.msg_lev = GLP_MSG_ON; break;
-+                    case 3: smcp.msg_lev = GLP_MSG_ALL; break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_SCALE", keystr)){
-+                switch(PYINT_AS_LONG(value)){
-+                    case 0: glp_unscale_prob(lp); break;
-+                    case 1: glp_scale_prob(lp, GLP_SF_EQ); break;
-+                    case 2: glp_scale_prob(lp, GLP_SF_GM); break;
-+                    case 3: glp_scale_prob(lp, GLP_SF_GM | GLP_SF_EQ); break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_DUAL", keystr)){
-+                switch(PYINT_AS_LONG(value)){
-+                    case 0: smcp.meth = GLP_PRIMAL; break;
-+                    case 1: smcp.meth = GLP_DUAL; break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_PRICE", keystr)){
-+                switch(PYINT_AS_LONG(value)){
-+                    case 0: smcp.pricing = GLP_PT_STD; break;
-+                    case 1: smcp.pricing = GLP_PT_PSE; break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_RELAX", keystr)){
-+                double relax = PyFloat_AsDouble(value);
-+                if (relax < 0.0 || relax > 1.0)
-+                    goto error;
-+                smcp.r_test = (relax == 0.0) ? GLP_RT_STD : GLP_RT_HAR;
-+            } else if (!strcmp("LPX_K_TOLBND", keystr)){
-+                smcp.tol_bnd = PyFloat_AsDouble(value);
-+                if (smcp.tol_bnd < DBL_EPSILON || smcp.tol_bnd > 0.001)
-+                    goto error;
-+            } else if (!strcmp("LPX_K_TOLDJ", keystr)){
-+                smcp.tol_dj = PyFloat_AsDouble(value);
-+                if (smcp.tol_dj < DBL_EPSILON || smcp.tol_dj > 0.001)
-+                    goto error;
-+            } else if (!strcmp("LPX_K_TOLPIV", keystr)){
-+                smcp.tol_piv = PyFloat_AsDouble(value);
-+                if (smcp.tol_piv < DBL_EPSILON || smcp.tol_piv > 0.001)
-+                    goto error;
-+            } else if (!strcmp("LPX_K_ROUND", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_OBJLL", keystr)){
-+                smcp.obj_ll = PyFloat_AsDouble(value);
-+            } else if (!strcmp("LPX_K_OBJUL", keystr)){
-+                smcp.obj_ul = PyFloat_AsDouble(value);
-+            } else if (!strcmp("LPX_K_ITLIM", keystr)){
-+                smcp.it_lim = PYINT_AS_LONG(value);
-+                if (smcp.it_lim < 0)
-+                    smcp.it_lim = INT_MAX;
-+            } else if (!strcmp("LPX_K_ITCNT", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_TMLIM", keystr)){
-+                smcp.tm_lim = (int)(PyFloat_AsDouble(value) * 1000.0);
-+                if (smcp.tm_lim < 0)
-+                    smcp.tm_lim = INT_MAX;
-+            } else if (!strcmp("LPX_K_OUTFRQ", keystr)){
-+                smcp.out_frq = PYINT_AS_LONG(value);
-+                if (smcp.out_frq <= 0)
-+                    goto error;
-+            } else if (!strcmp("LPX_K_OUTDLY", keystr)){
-+                smcp.out_dly = (int)(PyFloat_AsDouble(value) * 1000.0);
-+            } else if (!strcmp("LPX_K_BRANCH", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_BTRACK", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_TOLINT", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_TOLOBJ", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSINFO", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSOBJ", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSORIG", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSWIDE", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSFREE", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSSKIP", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_LPTORIG", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_PRESOL", keystr)){
-+                if (PYINT_AS_LONG(value) != 1)
-                     PyErr_Warn(PyExc_UserWarning, "ignoring value of "
-                         "GLPK parameter 'LPX_K_PRESOL'");
-+            } else if (!strcmp("LPX_K_BINARIZE", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_USECUTS", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_BFTYPE", keystr)){
-+                glp_bfcp bfcp;
-+
-+                glp_get_bfcp(lp, &bfcp);
-+                switch(PYINT_AS_LONG(value)){
-+                    case 1: bfcp.type = GLP_BF_FT; break;
-+                    case 2: bfcp.type = GLP_BF_BG; break;
-+                    case 3: bfcp.type = GLP_BF_GR; break;
-+                    default: goto error;
-                 }
--                else lpx_set_int_parm(lp, param_id,
--#if PY_MAJOR_VERSION >= 3
--                    PyLong_AS_LONG(value));
--#else
--                    PyInt_AS_LONG(value));
--#endif
--	    }
--	    else {
--#if PY_MAJOR_VERSION >= 3
--	        if (!PyLong_Check(value) && !PyFloat_Check(value)){
--#else
--	        if (!PyInt_Check(value) && !PyFloat_Check(value)){
--#endif
--                    sprintf(err_str, "invalid value for floating point "
--                        "GLPK parameter: %-.20s", keystr);
--                    PyErr_SetString(PyExc_ValueError, err_str);
--	            lpx_delete_prob(lp);
--	            Py_DECREF(param);
--                    return NULL;
--	        }
--	        lpx_set_real_parm(lp, param_id,
--                    PyFloat_AsDouble(value));
-+                glp_set_bfcp(lp, &bfcp);
-+            } else if (!strcmp("LPX_K_MIPGAP", keystr)){
-+                /* Ignored */
-+            } else {
-+                sprintf(err_str, "unknown GLPK parameter: %-.20s", keystr);
-+                PyErr_SetString(PyExc_ValueError, err_str);
-+                glp_delete_prob(lp);
-+                Py_DECREF(param);
-+                return NULL;
- 	    }
-+        }
-     }
--    lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
-+    smcp.presolve = GLP_ON;
-     Py_DECREF(param);
- 
--    switch (lpx_simplex(lp)){
-+    switch (glp_simplex(lp, &smcp)){
- 
--        case LPX_E_OK:
-+        case 0:
- 
-             x = (matrix *) Matrix_New(n,1,DOUBLE);
-             z = (matrix *) Matrix_New(m,1,DOUBLE);
-@@ -329,71 +356,61 @@ static PyObject *simplex(PyObject *self,
-                 Py_XDECREF(z);
-                 Py_XDECREF(y);
-                 Py_XDECREF(t);
--                lpx_delete_prob(lp);
-+                glp_delete_prob(lp);
-                 return PyErr_NoMemory();
-             }
- 
--            PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("optimal"));
--#else
--                PyString_FromString("optimal"));
--#endif
-+            PyTuple_SET_ITEM(t, 0, (PyObject *)PYSTRING_FROMSTRING("optimal"));
- 
-             for (i=0; i<n; i++)
--                MAT_BUFD(x)[i] = lpx_get_col_prim(lp, i+1);
-+                MAT_BUFD(x)[i] = glp_get_col_prim(lp, i+1);
-             PyTuple_SET_ITEM(t, 1, (PyObject *) x);
- 
-             for (i=0; i<m; i++)
--                MAT_BUFD(z)[i] = -lpx_get_row_dual(lp, i+1);
-+                MAT_BUFD(z)[i] = -glp_get_row_dual(lp, i+1);
-             PyTuple_SET_ITEM(t, 2, (PyObject *) z);
- 
-             if (A){
-                 for (i=0; i<p; i++)
--                    MAT_BUFD(y)[i] = -lpx_get_row_dual(lp, m+i+1);
-+                    MAT_BUFD(y)[i] = -glp_get_row_dual(lp, m+i+1);
-                 PyTuple_SET_ITEM(t, 3, (PyObject *) y);
-             }
- 
--            lpx_delete_prob(lp);
-+            glp_delete_prob(lp);
-             return (PyObject *) t;
- 
--        case LPX_E_NOPFS:
-+        case GLP_ENOPFS:
- 
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("primal infeasible"));
--#else
--                PyString_FromString("primal infeasible"));
--#endif
-+                PYSTRING_FROMSTRING("primal infeasible"));
-             break;
- 
--        case LPX_E_NODFS:
-+        case GLP_ENODFS:
- 
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("dual infeasible"));
--#else
--                PyString_FromString("dual infeasible"));
--#endif
-+                PYSTRING_FROMSTRING("dual infeasible"));
-             break;
- 
-         default:
- 
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("unknown"));
--#else
--                PyString_FromString("unknown"));
--#endif
-+                PYSTRING_FROMSTRING("unknown"));
-     }
- 
--    lpx_delete_prob(lp);
-+    glp_delete_prob(lp);
- 
-     PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
-     PyTuple_SET_ITEM(t, 2, Py_BuildValue(""));
-     if (A) PyTuple_SET_ITEM(t, 3, Py_BuildValue(""));
- 
-     return (PyObject *) t;
-+
-+error:
-+    sprintf(err_str, "invalid value for GLPK parameter: %-.20s", keystr);
-+    PyErr_SetString(PyExc_ValueError, err_str);
-+    glp_delete_prob(lp);
-+    Py_DECREF(param);
-+    return NULL;
- }
- 
- 
-@@ -428,11 +445,12 @@ static PyObject *integer(PyObject *self,
-     matrix *c, *h, *b=NULL, *x=NULL;
-     PyObject *G, *A=NULL, *IntSet=NULL, *BinSet = NULL;
-     PyObject *t=NULL, *param, *key, *value;
--    LPX *lp;
--    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
-+    glp_prob *lp;
-+    glp_iocp iocp;
-+    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL;
-     int_t pos=0;
-     double *a=NULL, val;
--    char param_type, err_str[100]; 
-+    char err_str[100]; 
- #if PY_MAJOR_VERSION >= 3
-     const char *keystr;
- #else
-@@ -490,18 +508,18 @@ static PyObject *integer(PyObject *self,
-     if ((BinSet) && (!PyAnySet_Check(BinSet)))
-       PY_ERR_TYPE("invalid binary index set");
- 
--    lp = lpx_create_prob();
--    lpx_add_rows(lp, m+p);
--    lpx_add_cols(lp, n);
-+    lp = glp_create_prob();
-+    glp_add_rows(lp, m+p);
-+    glp_add_cols(lp, n);
- 
-     for (i=0; i<n; i++){
--        lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
--        lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
-+        glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
-+        glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
-     }
-     for (i=0; i<m; i++)
--        lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
-+        glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
-     for (i=0; i<p; i++)
--        lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
-+        glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
-             MAT_BUFD(b)[i]);
- 
-     nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
-@@ -510,7 +528,7 @@ static PyObject *integer(PyObject *self,
-     rn = (int *) calloc(nnzmax+1, sizeof(int));
-     cn = (int *) calloc(nnzmax+1, sizeof(int));
-     if (!a || !rn || !cn){
--        free(a);  free(rn);  free(cn);  lpx_delete_prob(lp);
-+        free(a);  free(rn);  free(cn);  glp_delete_prob(lp);
-         return PyErr_NoMemory();
-     }
- 
-@@ -549,77 +567,152 @@ static PyObject *integer(PyObject *self,
-             nnz++;
-         }
- 
--    lpx_load_matrix(lp, nnz, rn, cn, a);
-+    glp_load_matrix(lp, nnz, rn, cn, a);
-     free(rn);  free(cn);  free(a);
- 
-     if (!(t = PyTuple_New(2))) {
--        lpx_delete_prob(lp);
-+        glp_delete_prob(lp);
-         return PyErr_NoMemory();
-     }
- 
-     if (!(param = PyObject_GetAttrString(glpk_module, "options"))
-         || !PyDict_Check(param)){
--            lpx_delete_prob(lp);
-+            glp_delete_prob(lp);
-             PyErr_SetString(PyExc_AttributeError,
-                 "missing glpk.options dictionary");
-             return NULL;
-     }
- 
--    while (PyDict_Next(param, &pos, &key, &value))
--#if PY_MAJOR_VERSION >= 3
--        if ((PyUnicode_Check(key)) && (keystr = PyUnicode_AS_DATA(key)) 
--            && get_param_idx(keystr, &param_id, &param_type)){
--#else
--        if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
--            &param_id, &param_type)){
--#endif
--	    if (param_type == 'i'){
--#if PY_MAJOR_VERSION >= 3
--	        if (!PyLong_Check(value)){
--#else
--	        if (!PyInt_Check(value)){
--#endif
--                    sprintf(err_str, "invalid value for integer "
--                        "GLPK parameter: %-.20s", keystr);
--                    PyErr_SetString(PyExc_ValueError, err_str);
--	            lpx_delete_prob(lp);
--	            Py_DECREF(param);
--                    return NULL;
--	        }
--                if (!strcmp("LPX_K_PRESOL", keystr) &&
-+    glp_init_iocp(&iocp);
-+    while (PyDict_Next(param, &pos, &key, &value)) {
- #if PY_MAJOR_VERSION >= 3
--                    PyLong_AS_LONG(value) != 1){
-+        if ((PyUnicode_Check(key)) && (keystr = PyUnicode_AS_DATA(key))){
- #else
--                    PyInt_AS_LONG(value) != 1){
-+        if ((keystr = PyString_AsString(key))){
- #endif
-+            if (!strcmp("LPX_K_MSGLEV", keystr)){
-+                switch (PYINT_AS_LONG(value)){
-+                    case 0: iocp.msg_lev = GLP_MSG_OFF; break;
-+                    case 1: iocp.msg_lev = GLP_MSG_ERR; break;
-+                    case 2: iocp.msg_lev = GLP_MSG_ON; break;
-+                    case 3: iocp.msg_lev = GLP_MSG_ALL; break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_SCALE", keystr)){
-+                switch(PYINT_AS_LONG(value)){
-+                    case 0: glp_unscale_prob(lp); break;
-+                    case 1: glp_scale_prob(lp, GLP_SF_EQ); break;
-+                    case 2: glp_scale_prob(lp, GLP_SF_GM); break;
-+                    case 3: glp_scale_prob(lp, GLP_SF_GM | GLP_SF_EQ); break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_DUAL", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_PRICE", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_RELAX", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_TOLBND", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_TOLDJ", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_TOLPIV", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_ROUND", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_OBJLL", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_OBJUL", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_ITLIM", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_ITCNT", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_TMLIM", keystr)){
-+                iocp.tm_lim = (int)(PyFloat_AsDouble(value) * 1000.0);
-+                if (iocp.tm_lim < 0)
-+                    iocp.tm_lim = INT_MAX;
-+            } else if (!strcmp("LPX_K_OUTFRQ", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_OUTDLY", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_BRANCH", keystr)){
-+                switch(PYINT_AS_LONG(value)){
-+                    case 0: iocp.br_tech = GLP_BR_FFV; break;
-+                    case 1: iocp.br_tech = GLP_BR_LFV; break;
-+                    case 2: iocp.br_tech = GLP_BR_DTH; break;
-+                    case 3: iocp.br_tech = GLP_BR_MFV; break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_BTRACK", keystr)){
-+                switch(PYINT_AS_LONG(value)){
-+                    case 0: iocp.bt_tech = GLP_BT_DFS; break;
-+                    case 1: iocp.bt_tech = GLP_BT_BFS; break;
-+                    case 2: iocp.bt_tech = GLP_BT_BPH; break;
-+                    case 3: iocp.bt_tech = GLP_BT_BLB; break;
-+                    default: goto error;
-+                }
-+            } else if (!strcmp("LPX_K_TOLINT", keystr)){
-+                iocp.tol_int = PyFloat_AsDouble(value);
-+                if (iocp.tol_int < DBL_EPSILON || iocp.tol_int > 0.001)
-+                    goto error;
-+            } else if (!strcmp("LPX_K_TOLOBJ", keystr)){
-+                iocp.tol_obj = PyFloat_AsDouble(value);
-+                if (iocp.tol_obj < DBL_EPSILON || iocp.tol_obj > 0.001)
-+                    goto error;
-+            } else if (!strcmp("LPX_K_MPSINFO", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSOBJ", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSORIG", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSWIDE", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSFREE", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_MPSSKIP", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_LPTORIG", keystr)){
-+                /* Ignored */
-+            } else if (!strcmp("LPX_K_PRESOL", keystr)){
-+                if (PYINT_AS_LONG(value) != 1)
-                     PyErr_Warn(PyExc_UserWarning, "ignoring value of "
-                         "GLPK parameter 'LPX_K_PRESOL'");
-+            } else if (!strcmp("LPX_K_BINARIZE", keystr)){
-+                iocp.binarize = (PYINT_AS_LONG(value) == 0) ? GLP_OFF : GLP_ON;
-+            } else if (!strcmp("LPX_K_USECUTS", keystr)){
-+                int cuts = PYINT_AS_LONG(value);
-+                if (cuts & ~0xFF)
-+                    goto error;
-+                iocp.cov_cuts = (cuts & 1) ? GLP_ON : GLP_OFF;
-+                iocp.clq_cuts = (cuts & 2) ? GLP_ON : GLP_OFF;
-+                iocp.gmi_cuts = (cuts & 4) ? GLP_ON : GLP_OFF;
-+                iocp.mir_cuts = (cuts & 8) ? GLP_ON : GLP_OFF;
-+            } else if (!strcmp("LPX_K_BFTYPE", keystr)){
-+                glp_bfcp bfcp;
-+
-+                glp_get_bfcp(lp, &bfcp);
-+                switch(PYINT_AS_LONG(value)){
-+                    case 1: bfcp.type = GLP_BF_FT; break;
-+                    case 2: bfcp.type = GLP_BF_BG; break;
-+                    case 3: bfcp.type = GLP_BF_GR; break;
-+                    default: goto error;
-                 }
--                else 
--#if PY_MAJOR_VERSION >= 3
--                    lpx_set_int_parm(lp, param_id, PyLong_AS_LONG(value));
--#else
--                    lpx_set_int_parm(lp, param_id, PyInt_AS_LONG(value));
--#endif
--	    }
--	    else {
--#if PY_MAJOR_VERSION >= 3
--	        if (!PyLong_Check(value) && !PyFloat_Check(value)){
--#else
--	        if (!PyInt_Check(value) && !PyFloat_Check(value)){
--#endif
--                    sprintf(err_str, "invalid value for floating point "
--                        "GLPK parameter: %-.20s", keystr);
--                    PyErr_SetString(PyExc_ValueError, err_str);
--	            lpx_delete_prob(lp);
--	            Py_DECREF(param);
--                    return NULL;
--	        }
--	        lpx_set_real_parm(lp, param_id,
--                    PyFloat_AsDouble(value));
-+                glp_set_bfcp(lp, &bfcp);
-+            } else if (!strcmp("LPX_K_MIPGAP", keystr)){
-+                iocp.mip_gap = PyFloat_AsDouble(value);
-+                if (iocp.mip_gap < 0.0)
-+                    goto error;
-+            } else {
-+                sprintf(err_str, "unknown GLPK parameter: %-.20s", keystr);
-+                PyErr_SetString(PyExc_ValueError, err_str);
-+                glp_delete_prob(lp);
-+                Py_DECREF(param);
-+                return NULL;
- 	    }
-+        }
-     }
--    lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
-+    iocp.presolve = GLP_ON;
-     Py_DECREF(param);
- 
-     if (IntSet) {
-@@ -628,22 +721,14 @@ static PyObject *integer(PyObject *self,
-       for (i=0; i<PySet_GET_SIZE(IntSet); i++) {
- 
- 	PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
--#if PY_MAJOR_VERSION >= 3
--	if (!PyLong_Check(tmp)) {
--#else
--	if (!PyInt_Check(tmp)) {
--#endif
--	  lpx_delete_prob(lp);
-+	if (!PYINT_CHECK(tmp)) {
-+	  glp_delete_prob(lp);
- 	  Py_DECREF(iter);
- 	  PY_ERR_TYPE("non-integer element in I");
- 	}
--#if PY_MAJOR_VERSION >= 3
--	int k = PyLong_AS_LONG(tmp);
--#else
--	int k = PyInt_AS_LONG(tmp);
--#endif
-+	int k = PYINT_AS_LONG(tmp);
- 	if ((k < 0) || (k >= n)) {
--	  lpx_delete_prob(lp);
-+	  glp_delete_prob(lp);
- 	  Py_DECREF(iter);
- 	  PY_ERR(PyExc_IndexError, "index element out of range in I");
- 	}
-@@ -659,22 +744,14 @@ static PyObject *integer(PyObject *self,
-       for (i=0; i<PySet_GET_SIZE(BinSet); i++) {
- 
- 	PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
--#if PY_MAJOR_VERSION >= 3
--	if (!PyLong_Check(tmp)) {
--#else
--	if (!PyInt_Check(tmp)) {
--#endif
--	  lpx_delete_prob(lp);
-+	if (!PYINT_CHECK(tmp)) {
-+	  glp_delete_prob(lp);
- 	  Py_DECREF(iter);
- 	  PY_ERR_TYPE("non-binary element in I");
- 	}
--#if PY_MAJOR_VERSION >= 3
--	int k = PyLong_AS_LONG(tmp);
--#else
--	int k = PyInt_AS_LONG(tmp);
--#endif
-+	int k = PYINT_AS_LONG(tmp);
- 	if ((k < 0) || (k >= n)) {
--	  lpx_delete_prob(lp);
-+	  glp_delete_prob(lp);
- 	  Py_DECREF(iter);
- 	  PY_ERR(PyExc_IndexError, "index element out of range in B");
- 	}
-@@ -686,117 +763,92 @@ static PyObject *integer(PyObject *self,
-     }
- 
- 
-+    switch (glp_intopt(lp, &iocp)){
- 
--    switch (lpx_intopt(lp)){
--
--        case LPX_E_OK:
-+        case 0:
- 
-             x = (matrix *) Matrix_New(n,1,DOUBLE);
-             if (!x) {
-                 Py_XDECREF(t);
--                lpx_delete_prob(lp);
-+                glp_delete_prob(lp);
-                 return PyErr_NoMemory();
-             }
--            PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("optimal"));
--#else
--                PyString_FromString("optimal"));
--#endif
-+            PyTuple_SET_ITEM(t, 0, (PyObject *)PYSTRING_FROMSTRING("optimal"));
- 
-             for (i=0; i<n; i++)
--                MAT_BUFD(x)[i] = lpx_mip_col_val(lp, i+1);
-+                MAT_BUFD(x)[i] = glp_mip_col_val(lp, i+1);
-             PyTuple_SET_ITEM(t, 1, (PyObject *) x);
- 
--            lpx_delete_prob(lp);
-+            glp_delete_prob(lp);
-             return (PyObject *) t;
- 
--        case LPX_E_TMLIM:
-+        case GLP_ETMLIM:
- 
-             x = (matrix *) Matrix_New(n,1,DOUBLE);
-             if (!x) {
-                 Py_XDECREF(t);
--                lpx_delete_prob(lp);
-+                glp_delete_prob(lp);
-                 return PyErr_NoMemory();
-             }
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("time limit exceeded"));
--#else
--                PyString_FromString("time limit exceeded"));
--#endif
-+                PYSTRING_FROMSTRING("time limit exceeded"));
- 
-             for (i=0; i<n; i++)
--                MAT_BUFD(x)[i] = lpx_mip_col_val(lp, i+1);
-+                MAT_BUFD(x)[i] = glp_mip_col_val(lp, i+1);
-             PyTuple_SET_ITEM(t, 1, (PyObject *) x);
- 
--            lpx_delete_prob(lp);
-+            glp_delete_prob(lp);
-             return (PyObject *) t;
- 
- 
--        case LPX_E_FAULT:
-+        case GLP_EBADB:
-+        case GLP_ECOND:
-+        case GLP_EBOUND:
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("invalid MIP formulation"));
--#else
--                PyString_FromString("invalid MIP formulation"));
--#endif
-+                PYSTRING_FROMSTRING("invalid MIP formulation"));
-             break;
- 
--	case LPX_E_NOPFS:
-+	case GLP_ENOPFS:
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("primal infeasible"));
--#else
--                PyString_FromString("primal infeasible"));
--#endif
-+                PYSTRING_FROMSTRING("primal infeasible"));
-             break;
- 
--	case LPX_E_NODFS:
-+	case GLP_ENODFS:
- 
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("dual infeasible"));
--#else
--                PyString_FromString("dual infeasible"));
--#endif
-+                PYSTRING_FROMSTRING("dual infeasible"));
-             break;
- 
--        case LPX_E_ITLIM:
-+        case GLP_EITLIM:
- 
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("maxiters exceeded"));
--#else
--                PyString_FromString("maxiters exceeded"));
--#endif
-+                PYSTRING_FROMSTRING("maxiters exceeded"));
-             break;
- 
--	case LPX_E_SING:
-+	case GLP_ESING:
- 
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("singular or ill-conditioned basis"));
--#else
--                PyString_FromString("singular or ill-conditioned basis"));
--#endif
-+                PYSTRING_FROMSTRING("singular or ill-conditioned basis"));
-             break;
- 
- 
-         default:
- 
-             PyTuple_SET_ITEM(t, 0, (PyObject *)
--#if PY_MAJOR_VERSION >= 3
--                PyUnicode_FromString("unknown"));
--#else
--                PyString_FromString("unknown"));
--#endif
-+                PYSTRING_FROMSTRING("unknown"));
-     }
- 
--    lpx_delete_prob(lp);
-+    glp_delete_prob(lp);
- 
-     PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
-     return (PyObject *) t;
-+
-+error:
-+    sprintf(err_str, "invalid value for GLPK parameter: %-.20s", keystr);
-+    PyErr_SetString(PyExc_ValueError, err_str);
-+    glp_delete_prob(lp);
-+    Py_DECREF(param);
-+    return NULL;
- }
- 
- 
diff --git a/dev-python/django-compressor/files/django-compressor-1.4-test.patch b/dev-python/django-compressor/files/django-compressor-1.4-test.patch
deleted file mode 100644
index 1d672bb5b8f4..000000000000
--- a/dev-python/django-compressor/files/django-compressor-1.4-test.patch
+++ /dev/null
@@ -1,306 +0,0 @@
- compressor/tests/test_base.py         |  6 +++---
- compressor/tests/test_filters.py      | 14 +++++++-------
- compressor/tests/test_jinja2ext.py    | 20 ++++++++++----------
- compressor/tests/test_storages.py     |  2 +-
- compressor/tests/test_templatetags.py | 22 +++++++++++-----------
- 5 files changed, 32 insertions(+), 32 deletions(-)
-
-diff --git a/compressor/tests/test_base.py b/compressor/tests/test_base.py
-index 46b1d91..6f70e80 100644
---- a/compressor/tests/test_base.py
-+++ b/compressor/tests/test_base.py
-@@ -112,7 +112,7 @@ class CompressorTestCase(SimpleTestCase):
-         hunks = '\n'.join([h for h in self.css_node.hunks()])
-         self.assertEqual(out, hunks)
- 
--    def test_css_mtimes(self):
-+    def _test_css_mtimes(self):
-         is_date = re.compile(r'^\d{10}[\.\d]+$')
-         for date in self.css_node.mtimes:
-             self.assertTrue(is_date.match(str(float(date))),
-@@ -122,7 +122,7 @@ class CompressorTestCase(SimpleTestCase):
-         settings.COMPRESS_ENABLED = False
-         self.assertEqualCollapsed(self.css, self.css_node.output())
- 
--    def test_cachekey(self):
-+    def _test_cachekey(self):
-         is_cachekey = re.compile(r'\w{12}')
-         self.assertTrue(is_cachekey.match(self.css_node.cachekey),
-             "cachekey is returning something that doesn't look like r'\w{12}'")
-@@ -265,6 +265,6 @@ class VerboseTestCase(CompressorTestCase):
- 
- class CacheBackendTestCase(CompressorTestCase):
- 
--    def test_correct_backend(self):
-+    def _test_correct_backend(self):
-         from compressor.cache import cache
-         self.assertEqual(cache.__class__, locmem.CacheClass)
-diff --git a/compressor/tests/test_filters.py b/compressor/tests/test_filters.py
-index b656a65..6b3e801 100644
---- a/compressor/tests/test_filters.py
-+++ b/compressor/tests/test_filters.py
-@@ -120,7 +120,7 @@ class CssAbsolutizingTestCase(TestCase):
-         settings.COMPRESS_URL = self.old_url
-         settings.COMPRESS_CSS_HASHING_METHOD = self.old_hashing_method
- 
--    def test_css_absolute_filter(self):
-+    def _test_css_absolute_filter(self):
-         filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
-         imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
-         params = {
-@@ -138,7 +138,7 @@ class CssAbsolutizingTestCase(TestCase):
-                   "p { filter: Alpha(src='%(url)simg/python.png?%(hash)s') }") % params
-         self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
- 
--    def test_css_absolute_filter_url_fragment(self):
-+    def _test_css_absolute_filter_url_fragment(self):
-         filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
-         imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
-         params = {
-@@ -166,7 +166,7 @@ class CssAbsolutizingTestCase(TestCase):
-         filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
-         self.assertEqual(content, filter.input(filename=filename, basename='css/url/test.css'))
- 
--    def test_css_absolute_filter_querystring(self):
-+    def _test_css_absolute_filter_querystring(self):
-         filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
-         imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
-         params = {
-@@ -184,7 +184,7 @@ class CssAbsolutizingTestCase(TestCase):
-         output = "p { background: url('%(url)simg/python.png?foo&%(hash)s') }" % params
-         self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
- 
--    def test_css_absolute_filter_https(self):
-+    def _test_css_absolute_filter_https(self):
-         filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
-         imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
-         params = {
-@@ -202,7 +202,7 @@ class CssAbsolutizingTestCase(TestCase):
-                   "p { filter: Alpha(src='%(url)simg/python.png?%(hash)s') }") % params
-         self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
- 
--    def test_css_absolute_filter_relative_path(self):
-+    def _test_css_absolute_filter_relative_path(self):
-         filename = os.path.join(settings.TEST_DIR, 'whatever', '..', 'static', 'whatever/../css/url/test.css')
-         imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')
-         params = {
-@@ -219,7 +219,7 @@ class CssAbsolutizingTestCase(TestCase):
-                   "p { filter: Alpha(src='%(url)simg/python.png?%(hash)s') }") % params
-         self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
- 
--    def test_css_hunks(self):
-+    def _test_css_hunks(self):
-         hash_dict = {
-             'hash1': self.hashing_func(os.path.join(settings.COMPRESS_ROOT, 'img/python.png')),
-             'hash2': self.hashing_func(os.path.join(settings.COMPRESS_ROOT, 'img/add.png')),
-@@ -276,7 +276,7 @@ class CssDataUriTestCase(TestCase):
-         """
-         self.css_node = CssCompressor(self.css)
- 
--    def test_data_uris(self):
-+    def _test_data_uris(self):
-         datauri_hash = get_hashed_mtime(os.path.join(settings.COMPRESS_ROOT, 'img/python.png'))
-         out = ['''.add { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlkoqCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94VTUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpKtE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0HglWNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1VMzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVPC4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnjahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQyu/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg=="); }
- .add-with-hash { background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlkoqCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94VTUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpKtE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0HglWNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1VMzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVPC4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnjahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQyu/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg=="); }
-diff --git a/compressor/tests/test_jinja2ext.py b/compressor/tests/test_jinja2ext.py
-index 5adc8ee..c7203c6 100644
---- a/compressor/tests/test_jinja2ext.py
-+++ b/compressor/tests/test_jinja2ext.py
-@@ -64,19 +64,19 @@ class TestJinja2CompressorExtension(TestCase):
-         template = self.env.from_string(template_string)
-         self.assertEqual(tag_body, template.render())
- 
--    def test_empty_tag(self):
-+    def _test_empty_tag(self):
-         template = self.env.from_string("""{% compress js %}{% block js %}
-         {% endblock %}{% endcompress %}""")
-         context = {'STATIC_URL': settings.COMPRESS_URL}
-         self.assertEqual('', template.render(context))
- 
--    def test_empty_tag_with_kind(self):
-+    def _test_empty_tag_with_kind(self):
-         template = self.env.from_string("""{% compress js %}{% block js %}
-         {% endblock %}{% endcompress js %}""")
-         context = {'STATIC_URL': settings.COMPRESS_URL}
-         self.assertEqual('', template.render(context))
- 
--    def test_css_tag(self):
-+    def _test_css_tag(self):
-         template = self.env.from_string("""{% compress css -%}
-         <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css" charset="utf-8">
-         <style type="text/css">p { border:5px solid green;}</style>
-@@ -86,7 +86,7 @@ class TestJinja2CompressorExtension(TestCase):
-         out = css_tag("/static/CACHE/css/e41ba2cc6982.css")
-         self.assertEqual(out, template.render(context))
- 
--    def test_nonascii_css_tag(self):
-+    def _test_nonascii_css_tag(self):
-         template = self.env.from_string("""{% compress css -%}
-         <link rel="stylesheet" href="{{ STATIC_URL }}css/nonasc.css" type="text/css" charset="utf-8">
-         <style type="text/css">p { border:5px solid green;}</style>
-@@ -95,7 +95,7 @@ class TestJinja2CompressorExtension(TestCase):
-         out = css_tag("/static/CACHE/css/799f6defe43c.css")
-         self.assertEqual(out, template.render(context))
- 
--    def test_js_tag(self):
-+    def _test_js_tag(self):
-         template = self.env.from_string("""{% compress js -%}
-         <script src="{{ STATIC_URL }}js/one.js" type="text/javascript" charset="utf-8"></script>
-         <script type="text/javascript" charset="utf-8">obj.value = "value";</script>
-@@ -104,7 +104,7 @@ class TestJinja2CompressorExtension(TestCase):
-         out = '<script type="text/javascript" src="/static/CACHE/js/066cd253eada.js"></script>'
-         self.assertEqual(out, template.render(context))
- 
--    def test_nonascii_js_tag(self):
-+    def _test_nonascii_js_tag(self):
-         template = self.env.from_string("""{% compress js -%}
-         <script src="{{ STATIC_URL }}js/nonasc.js" type="text/javascript" charset="utf-8"></script>
-         <script type="text/javascript" charset="utf-8">var test_value = "\u2014";</script>
-@@ -113,7 +113,7 @@ class TestJinja2CompressorExtension(TestCase):
-         out = '<script type="text/javascript" src="/static/CACHE/js/e214fe629b28.js"></script>'
-         self.assertEqual(out, template.render(context))
- 
--    def test_nonascii_latin1_js_tag(self):
-+    def _test_nonascii_latin1_js_tag(self):
-         template = self.env.from_string("""{% compress js -%}
-         <script src="{{ STATIC_URL }}js/nonasc-latin1.js" type="text/javascript" charset="latin-1"></script>
-         <script type="text/javascript">var test_value = "\u2014";</script>
-@@ -122,7 +122,7 @@ class TestJinja2CompressorExtension(TestCase):
-         out = '<script type="text/javascript" src="/static/CACHE/js/be9e078b5ca7.js"></script>'
-         self.assertEqual(out, template.render(context))
- 
--    def test_css_inline(self):
-+    def _test_css_inline(self):
-         template = self.env.from_string("""{% compress css, inline -%}
-         <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css" charset="utf-8">
-         <style type="text/css">p { border:5px solid green;}</style>
-@@ -134,7 +134,7 @@ class TestJinja2CompressorExtension(TestCase):
-         ])
-         self.assertEqual(out, template.render(context))
- 
--    def test_js_inline(self):
-+    def _test_js_inline(self):
-         template = self.env.from_string("""{% compress js, inline -%}
-         <script src="{{ STATIC_URL }}js/one.js" type="text/css" type="text/javascript" charset="utf-8"></script>
-         <script type="text/javascript" charset="utf-8">obj.value = "value";</script>
-@@ -143,7 +143,7 @@ class TestJinja2CompressorExtension(TestCase):
-         out = '<script type="text/javascript">obj={};obj.value="value";</script>'
-         self.assertEqual(out, template.render(context))
- 
--    def test_nonascii_inline_css(self):
-+    def _test_nonascii_inline_css(self):
-         org_COMPRESS_ENABLED = settings.COMPRESS_ENABLED
-         settings.COMPRESS_ENABLED = False
-         template = self.env.from_string('{% compress css %}'
-diff --git a/compressor/tests/test_storages.py b/compressor/tests/test_storages.py
-index 91a36f2..986fef1 100644
---- a/compressor/tests/test_storages.py
-+++ b/compressor/tests/test_storages.py
-@@ -34,7 +34,7 @@ class StorageTestCase(TestCase):
-         self.assertTrue(os.path.exists(os.path.join(settings.COMPRESS_ROOT, 'test.txt')))
-         self.assertTrue(os.path.exists(os.path.join(settings.COMPRESS_ROOT, 'test.txt.gz')))
- 
--    def test_css_tag_with_storage(self):
-+    def _test_css_tag_with_storage(self):
-         template = """{% load compress %}{% compress css %}
-         <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css">
-         <style type="text/css">p { border:5px solid white;}</style>
-diff --git a/compressor/tests/test_templatetags.py b/compressor/tests/test_templatetags.py
-index db0d1b7..f2f1cc6 100644
---- a/compressor/tests/test_templatetags.py
-+++ b/compressor/tests/test_templatetags.py
-@@ -34,12 +34,12 @@ class TemplatetagTestCase(TestCase):
-     def tearDown(self):
-         settings.COMPRESS_ENABLED = self.old_enabled
- 
--    def test_empty_tag(self):
-+    def _test_empty_tag(self):
-         template = """{% load compress %}{% compress js %}{% block js %}
-         {% endblock %}{% endcompress %}"""
-         self.assertEqual('', render(template, self.context))
- 
--    def test_css_tag(self):
-+    def _test_css_tag(self):
-         template = """{% load compress %}{% compress css %}
- <link rel="stylesheet" href="{{ STATIC_URL }}css/one.css" type="text/css">
- <style type="text/css">p { border:5px solid green;}</style>
-@@ -48,7 +48,7 @@ class TemplatetagTestCase(TestCase):
-         out = css_tag("/static/CACHE/css/e41ba2cc6982.css")
-         self.assertEqual(out, render(template, self.context))
- 
--    def test_uppercase_rel(self):
-+    def _test_uppercase_rel(self):
-         template = """{% load compress %}{% compress css %}
- <link rel="StyleSheet" href="{{ STATIC_URL }}css/one.css" type="text/css">
- <style type="text/css">p { border:5px solid green;}</style>
-@@ -57,7 +57,7 @@ class TemplatetagTestCase(TestCase):
-         out = css_tag("/static/CACHE/css/e41ba2cc6982.css")
-         self.assertEqual(out, render(template, self.context))
- 
--    def test_nonascii_css_tag(self):
-+    def _test_nonascii_css_tag(self):
-         template = """{% load compress %}{% compress css %}
-         <link rel="stylesheet" href="{{ STATIC_URL }}css/nonasc.css" type="text/css">
-         <style type="text/css">p { border:5px solid green;}</style>
-@@ -66,7 +66,7 @@ class TemplatetagTestCase(TestCase):
-         out = css_tag("/static/CACHE/css/799f6defe43c.css")
-         self.assertEqual(out, render(template, self.context))
- 
--    def test_js_tag(self):
-+    def _test_js_tag(self):
-         template = """{% load compress %}{% compress js %}
-         <script src="{{ STATIC_URL }}js/one.js" type="text/javascript"></script>
-         <script type="text/javascript">obj.value = "value";</script>
-@@ -75,7 +75,7 @@ class TemplatetagTestCase(TestCase):
-         out = '<script type="text/javascript" src="/static/CACHE/js/066cd253eada.js"></script>'
-         self.assertEqual(out, render(template, self.context))
- 
--    def test_nonascii_js_tag(self):
-+    def _test_nonascii_js_tag(self):
-         template = """{% load compress %}{% compress js %}
-         <script src="{{ STATIC_URL }}js/nonasc.js" type="text/javascript"></script>
-         <script type="text/javascript">var test_value = "\u2014";</script>
-@@ -84,7 +84,7 @@ class TemplatetagTestCase(TestCase):
-         out = '<script type="text/javascript" src="/static/CACHE/js/e214fe629b28.js"></script>'
-         self.assertEqual(out, render(template, self.context))
- 
--    def test_nonascii_latin1_js_tag(self):
-+    def _test_nonascii_latin1_js_tag(self):
-         template = """{% load compress %}{% compress js %}
-         <script src="{{ STATIC_URL }}js/nonasc-latin1.js" type="text/javascript" charset="latin-1"></script>
-         <script type="text/javascript">var test_value = "\u2014";</script>
-@@ -115,7 +115,7 @@ class TemplatetagTestCase(TestCase):
-         <script type="text/javascript">obj.value = "value";</script>"""
-         self.assertEqual(out, render(template, context))
- 
--    def test_named_compress_tag(self):
-+    def _test_named_compress_tag(self):
-         template = """{% load compress %}{% compress js inline foo %}
-         <script type="text/javascript">obj.value = "value";</script>
-         {% endcompress %}
-@@ -150,14 +150,14 @@ class PrecompilerTemplatetagTestCase(TestCase):
-         settings.COMPRESS_ENABLED = self.old_enabled
-         settings.COMPRESS_PRECOMPILERS = self.old_precompilers
- 
--    def test_compress_coffeescript_tag(self):
-+    def _test_compress_coffeescript_tag(self):
-         template = """{% load compress %}{% compress js %}
-             <script type="text/coffeescript"># this is a comment.</script>
-             {% endcompress %}"""
-         out = script(src="/static/CACHE/js/e920d58f166d.js")
-         self.assertEqual(out, render(template, self.context))
- 
--    def test_compress_coffeescript_tag_and_javascript_tag(self):
-+    def _test_compress_coffeescript_tag_and_javascript_tag(self):
-         template = """{% load compress %}{% compress js %}
-             <script type="text/coffeescript"># this is a comment.</script>
-             <script type="text/javascript"># this too is a comment.</script>
-@@ -176,7 +176,7 @@ class PrecompilerTemplatetagTestCase(TestCase):
-         self.assertEqual(out, render(template, self.context))
- 
-     @override_settings(COMPRESS_ENABLED=False)
--    def test_compress_coffeescript_tag_compress_enabled_is_false(self):
-+    def _test_compress_coffeescript_tag_compress_enabled_is_false(self):
-         template = """{% load compress %}{% compress js %}
-             <script type="text/coffeescript"># this is a comment.</script>
-             {% endcompress %}"""
diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest
index 33e719f161ee..1f4605cd0d3b 100644
--- a/dev-python/django-openstack-auth/Manifest
+++ b/dev-python/django-openstack-auth/Manifest
@@ -1,2 +1 @@
-DIST django_openstack_auth-1.2.0.tar.gz 75577 SHA256 5ad78e5c92502f1abfb10fd101c023adf74a3e728bd42ed19ffea2185680f9a6 SHA512 793f0763b47574574864c16c9d79787d44c84259304587b5d2b3375de04291c5d200699297960b3b3904b959ceee31f696fef2233659db9b846c6af06fd8c251 WHIRLPOOL 37632e35beb810979ffb7878c9ffed0258a64caf4a80f61050bb054d70b56e09c9f0f13dac2ce339b87ccdcbeba779893c2ce81912b95f50d52a88b947872092
 DIST django_openstack_auth-1.3.1.tar.gz 75165 SHA256 99c6e92170656eade430d31f79ddf60e66355ff7b84caf038ab1ecc879cff9ba SHA512 cf9b4a1c526f237a23dadab4a7e6a2bd1f80a8d6d89d9b83f4d0fb6fc4df80aba68ad344662fbeaddeca2ca8ec36856af1074da383368d85d56460ed199609aa WHIRLPOOL b99b9381ce9eb1357939b750a40f86373fcbbe411d90a23e15f2d1e77dcfab45e58ac69e4e774228dc1b0dc3d3a0649e451efc0f271e904a4241b06c80b4d8bd
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild
deleted file mode 100644
index 48e1247e1587..000000000000
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend"
-HOMEPAGE="http://django_openstack_auth.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz"
-S="${WORKDIR}/django_openstack_auth-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-	<dev-python/django-1.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed"
-}
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
index 53af5aa70a13..a9b838bba1b8 100644
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
+++ b/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
@@ -20,7 +20,6 @@ IUSE="doc test"
 CDEPEND=">=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 		>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 		<dev-python/pbr-2.0[${PYTHON_USEDEP}]
@@ -38,7 +37,6 @@ RDEPEND="
 	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
 	<dev-python/django-1.8[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/django-recaptcha/files/django-recaptcha-fields.patch b/dev-python/django-recaptcha/files/django-recaptcha-fields.patch
deleted file mode 100644
index 2bd0d32c967e..000000000000
--- a/dev-python/django-recaptcha/files/django-recaptcha-fields.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur django-recaptcha-0.0.6.orig/captcha/fields.py django-recaptcha-0.0.6/captcha/fields.py
---- captcha/fields.py	2013-01-31 17:05:59.000000000 +0800
-+++ captcha/fields.py	2013-03-07 01:44:54.804708648 +0800
-@@ -2,13 +2,12 @@
- import sys
- 
- from django import forms
--from django.conf import settings
- from django.utils.encoding import smart_unicode
- from django.utils.translation import ugettext_lazy as _
- 
- from captcha import client
- from captcha.widgets import ReCaptcha
--
-+from captcha import test_settings as settings
- 
- class ReCaptchaField(forms.CharField):
-     default_error_messages = {
diff --git a/dev-python/django-recaptcha/files/django-recaptcha-settings.patch b/dev-python/django-recaptcha/files/django-recaptcha-settings.patch
deleted file mode 100644
index c28694ee4d1a..000000000000
--- a/dev-python/django-recaptcha/files/django-recaptcha-settings.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- /dev/null	2013-03-05 00:07:00.881999836 +0800
-+++ captcha/settings.py	2013-03-07 02:27:52.302580399 +0800
-@@ -0,0 +1,3 @@
-+RECAPTCHA_PUBLIC_KEY='76wtgdfsjhsydt7r5FFGFhgsdfytd656sad75fgh'
-+RECAPTCHA_PRIVATE_KEY='98dfg6df7g56df6gdfgdfg65JHJH656565GFGFGs'
-+RECAPTCHA_USE_SSL='True'
diff --git a/dev-python/django-recaptcha/files/test_settings.py b/dev-python/django-recaptcha/files/test_settings.py
deleted file mode 100644
index 5e66d9e454a2..000000000000
--- a/dev-python/django-recaptcha/files/test_settings.py
+++ /dev/null
@@ -1,14 +0,0 @@
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'test.sqlite',
-    }
-}
-
-INSTALLED_APPS = [
-    'captcha',
-]
-
-RECAPTCHA_PRIVATE_KEY = '98dfg6df7g56df6gdfgdfg65JHJH656565GFGFGs'
-RECAPTCHA_PUBLIC_KEY = '76wtgdfsjhsydt7r5FFGFhgsdfytd656sad75fgh'
-RECAPTCHA_USE_SSL='True'
diff --git a/dev-python/docutils/files/docutils-0.6-extra_modules.patch b/dev-python/docutils/files/docutils-0.6-extra_modules.patch
deleted file mode 100644
index ca5de4b7fc4e..000000000000
--- a/dev-python/docutils/files/docutils-0.6-extra_modules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -182,19 +182,8 @@
- List of (module name, minimum __version__ string, [attribute names])."""
- 
- def get_extras():
--    extras = []
--    for module_name, version, attributes in extra_modules:
--        try:
--            module = __import__(module_name)
--            if version and module.__version__ < version:
--                raise ValueError
--            for attribute in attributes or []:
--                getattr(module, attribute)
--            print ('"%s" module already present; ignoring extras/%s.py.'
--                   % (module_name, module_name))
--        except (ImportError, AttributeError, ValueError):
--            extras.append(module_name)
--    return extras
-+    # Old method does not work for upgrading/downgrading docutils.
-+    return ["roman"]
- 
- 
- if __name__ == '__main__' :
diff --git a/dev-python/docutils/files/docutils-0.7-encoding.patch b/dev-python/docutils/files/docutils-0.7-encoding.patch
deleted file mode 100644
index 9a88f9fedaa6..000000000000
--- a/dev-python/docutils/files/docutils-0.7-encoding.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- docutils/nodes.py
-+++ docutils/nodes.py
-@@ -27,6 +27,7 @@
- import warnings
- import types
- import unicodedata
-+import locale
- 
- # ==============================
- #  Functional Node Base Classes
-@@ -328,6 +329,9 @@
-     else:
-         def __new__(cls, data, rawsource=None):
-             """Prevent the rawsource argument from propagating to str."""
-+            encoding = locale.getdefaultlocale()[1]
-+            if isinstance(data, str) and encoding is not None:
-+                data = data.decode(encoding)
-             return reprunicode.__new__(cls, data)
- 
-     def __init__(self, data, rawsource=''):
---- docutils/parsers/rst/directives/misc.py
-+++ docutils/parsers/rst/directives/misc.py
-@@ -10,6 +10,7 @@
- import os.path
- import re
- import time
-+import locale
- from docutils import io, nodes, statemachine, utils
- from docutils.parsers.rst import Directive, convert_directive_function
- from docutils.parsers.rst import directives, roles, states
-@@ -66,8 +67,16 @@
-                                input_encoding_error_handler),
-                 handle_io_errors=None)
-         except IOError, error:
--            raise self.severe('Problems with "%s" directive path:\n%s: %s.' %
--                        (self.name, error.__class__.__name__, str(error)))
-+            if sys.version_info < (3,):
-+                error_string = str(error)
-+                encoding = locale.getdefaultlocale()[1]
-+                if encoding is not None:
-+                    error_string = error_string.decode(encoding)
-+                raise self.severe(u'Problems with "%s" directive path:\n%s: %s.' %
-+                            (self.name, error.__class__.__name__, error_string))
-+            else:
-+                raise self.severe('Problems with "%s" directive path:\n%s: %s.' %
-+                            (self.name, error.__class__.__name__, str(error)))
-             # Hack: Since Python 2.6, the string interpolation returns a
-             # unicode object if one of the supplied %s replacements is a
-             # unicode object. IOError has no `__unicode__` method and the
---- tools/buildhtml.py
-+++ tools/buildhtml.py
-@@ -15,8 +15,8 @@
- __docformat__ = 'reStructuredText'
- 
- 
-+import locale
- try:
--    import locale
-     locale.setlocale(locale.LC_ALL, '')
- except:
-     pass
-@@ -236,8 +236,19 @@
-                               writer_name=pub_struct.writer_name,
-                               settings=settings)
-         except ApplicationError, error:
--            print >>sys.stderr, ('        Error (%s): %s'
--                                 % (error.__class__.__name__, error))
-+            if sys.version_info < (3,):
-+                encoding = locale.getdefaultlocale()[1]
-+                if isinstance(error.message, unicode) and encoding is not None:
-+                    error_message = (u'        Error (%s): %s'
-+                                     % (error.__class__.__name__, error))
-+                    error_message = error_message.encode(encoding)
-+                else:
-+                    error_message = ('        Error (%s): %s'
-+                                     % (error.__class__.__name__, error))
-+                print >>sys.stderr, error_message
-+            else:
-+                print >>sys.stderr, ('        Error (%s): %s'
-+                                     % (error.__class__.__name__, error))
- 
- 
- if __name__ == "__main__":
diff --git a/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch b/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch
deleted file mode 100644
index 4867e7099ac1..000000000000
--- a/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&atid=422030&aid=3149845&group_id=38414
-
---- docutils/frontend.py
-+++ docutils/frontend.py
-@@ -671,7 +671,7 @@
-         raise KeyError('No option with dest == %r.' % dest)
- 
- 
--class ConfigParser(CP.ConfigParser):
-+class ConfigParser(CP.RawConfigParser):
- 
-     old_settings = {
-         'pep_stylesheet': ('pep_html writer', 'stylesheet'),
-@@ -693,7 +693,7 @@
- """
- 
-     def __init__(self, *args, **kwargs):
--        CP.ConfigParser.__init__(self, *args, **kwargs)
-+        CP.RawConfigParser.__init__(self, *args, **kwargs)
- 
-         self._files = []
-         """List of paths of configuration files read."""
-@@ -708,7 +708,7 @@
-             except IOError:
-                 continue
-             try:
--                CP.ConfigParser.readfp(self, fp, filename)
-+                CP.RawConfigParser.readfp(self, fp, filename)
-             except UnicodeDecodeError:
-                 sys.stderr.write(self.not_utf8_error % (filename, filename))
-                 fp.close()
-@@ -749,7 +749,7 @@
-                 except KeyError:
-                     continue
-                 if option.validator:
--                    value = self.get(section, setting, raw=1)
-+                    value = self.get(section, setting)
-                     try:
-                         new_value = option.validator(
-                             setting, value, option_parser,
-@@ -778,7 +778,7 @@
-         section_dict = {}
-         if self.has_section(section):
-             for option in self.options(section):
--                section_dict[option] = self.get(section, option, raw=1)
-+                section_dict[option] = self.get(section, option)
-         return section_dict
- 
- 
diff --git a/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch b/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch
deleted file mode 100644
index 0e77f7e974a8..000000000000
--- a/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://svn.berlios.de/viewvc/docutils?view=revision&revision=7013
-
---- docutils/writers/odf_odt/__init__.py
-+++ docutils/writers/odf_odt/__init__.py
-@@ -300,7 +300,10 @@
- 
- def ToString(et):
-     outstream = StringIO.StringIO()
--    et.write(outstream)
-+    if sys.version_info >= (3, 2):
-+        et.write(outstream, encoding="unicode")
-+    else:
-+        et.write(outstream)
-     s1 = outstream.getvalue()
-     outstream.close()
-     return s1
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 998c7a830554..fe35b20d9d69 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,3 +1 @@
-DIST dugong-3.4.tar.bz2 190012 SHA256 148a65931b52e030f8eb5e1dd2740eb62754ad0c831d15c22f923f7f8274ad33 SHA512 67cf314629298249bfe0305ce2d79f66b71d6415090fab9721e62c38549863098b3048f2936532073dfe52438cf638fbc4ce46cbdbae14b7dd5158e8d9a1cdbb WHIRLPOOL b8be0bb5f7475f85ae219199a993362759646a9972934be14372b16455b18f1f2f33f4bdb553ef762e887673dc198ac6f07d863fe715a70721f2e4763752b9af
-DIST dugong-3.5.tar.bz2 192228 SHA256 44bc81cd25b2e8762458b59f2f2382a3e59869c457edbbcdfe03541e576f1978 SHA512 204d8fceb63e9036f026e5a23da028a41600a740ceaa42f54474a1986c19cb224ca335d81c24c257dd761ac0f58443091df1d95fb0e1776eb3227c18d5331e39 WHIRLPOOL 678525106190b82c0be3d2c0ab72d006a8bd1b4343071bfa8d9702a7d8619859406f39a59a6bd87160d9ca31bf026cb547a55bc75907f645eba2da24ab77c1e3
 DIST dugong-3.7.tar.bz2 193975 SHA256 68f7810742e1c54a5cddfa49992d416704c13b25263bd3278f7581cbc2adb2e1 SHA512 f6e637946ec5f402a21dc40f08ab187bed281b4b7c27c056651eac049d9aaf4c952bfa5e19c05db6cac2d284cf7dbd47250b82cdbcac998971fd10466a47fe21 WHIRLPOOL 3ee51fc0f085f94f64d04b6ef04fb69db8f4a569347eee4fbb1e18727343752dbf6b7df080776ca38b87f49d8495b5bd6361eb25f3cd12b4bc54b911be96a87c
diff --git a/dev-python/dugong/dugong-3.4.ebuild b/dev-python/dugong/dugong-3.4.ebuild
deleted file mode 100644
index 873b143d16de..000000000000
--- a/dev-python/dugong/dugong-3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dugong/dugong-3.5.ebuild b/dev-python/dugong/dugong-3.5.ebuild
deleted file mode 100644
index 71cc545d98e2..000000000000
--- a/dev-python/dugong/dugong-3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_{3,4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dugong/dugong-3.7.ebuild b/dev-python/dugong/dugong-3.7.ebuild
index 22d464e1eb5a..23767fff2035 100644
--- a/dev-python/dugong/dugong-3.7.ebuild
+++ b/dev-python/dugong/dugong-3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/dugong/files/3.2-aborted_write.patch b/dev-python/dugong/files/3.2-aborted_write.patch
deleted file mode 100644
index bf25a3772e15..000000000000
--- a/dev-python/dugong/files/3.2-aborted_write.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bitbucket.org/nikratio/python-dugong/issue/13/test_aborted_write-failures-in-latest
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -540,7 +540,7 @@
-     conn.readall()
- 
- def test_aborted_write1(conn, monkeypatch):
--    BUFSIZE = 64*1024
-+    BUFSIZE = 640*1024
- 
-     # Monkeypatch request handler
-     def do_PUT(self):
-@@ -561,8 +561,9 @@
- 
-     # Try to write data
-     with pytest.raises(ConnectionClosed):
--        for _ in range(50):
-+        for _ in range(5000):
-             conn.write(b'f' * BUFSIZE)
-+            time.sleep(0.1)
- 
-     # Nevertheless, try to read response
-     resp = conn.read_response()
-@@ -570,7 +571,7 @@
-     assert resp.reason == 'Please stop!'
- 
- def test_aborted_write2(conn, monkeypatch):
--    BUFSIZE = 64*1024
-+    BUFSIZE = 640*1024
- 
-     # Monkeypatch request handler
-     def do_PUT(self):
-@@ -589,8 +590,9 @@
- 
-     # Try to write data
-     with pytest.raises(ConnectionClosed):
--        for _ in range(50):
-+        for _ in range(5000):
-             conn.write(b'f' * BUFSIZE)
-+            time.sleep(0.1)
- 
-     # Nevertheless, try to read response
-     assert_raises(ConnectionClosed, conn.read_response)
-
diff --git a/dev-python/dugong/files/3.2-extract_links.patch b/dev-python/dugong/files/3.2-extract_links.patch
deleted file mode 100644
index 0e8d251bdd86..000000000000
--- a/dev-python/dugong/files/3.2-extract_links.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Nikolaus Rath <Nikolaus@rath.org>
-# Date 1407732767 25200
-# Node ID 1cfd473db8736251291e106ce6cd488011626276
-# Parent  cd7ad81f4eea24e530db152edd6d8831dc5bd7bc
-Make extract_links.py Python 3.3 compatible again.
-
-Fixes issue #15.
-
-diff --git a/examples/extract_links.py b/examples/extract_links.py
---- a/examples/extract_links.py
-+++ b/examples/extract_links.py
-@@ -30,7 +30,11 @@
- 
- class LinkExtractor(HTMLParser):
-     def __init__(self):
--        super().__init__(convert_charrefs=True)
-+        if sys.version_info < (3,4):
-+            # Python 3.3 doesn't know about convert_charrefs
-+            super().__init__()
-+        else:
-+            super().__init__(convert_charrefs=True)
-         self.links = []
- 
-     def handle_starttag(self, tag, attrs):
-
diff --git a/dev-python/dugong/files/3.2-timeout.patch b/dev-python/dugong/files/3.2-timeout.patch
deleted file mode 100644
index 5ee43f7367c7..000000000000
--- a/dev-python/dugong/files/3.2-timeout.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bitbucket.org/nikratio/python-dugong/issue/14/test_send_timeout-ssl-failure-in-latest
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -726,11 +728,11 @@
- 
-     # We don't know how much data can be buffered, so we
-     # claim to send a lot and do so in a loop.
--    len_ = 1024**3
-+    len_ = 10 * 1024**3
-     conn.send_request('PUT', '/recv_something', body=BodyFollowing(len_))
-     with pytest.raises(dugong.ConnectionTimedOut):
-         while len_ > 0:
--            conn.write(b'x' * min(len_, 16*1024))
-+            conn.write(b'x' * min(len_, 640*1024))
- 
- 
- DUMMY_DATA = ','.join(str(x) for x in range(10000)).encode()
-
diff --git a/dev-python/dugong/files/3.3-test-timeout.patch b/dev-python/dugong/files/3.3-test-timeout.patch
deleted file mode 100644
index afd391207976..000000000000
--- a/dev-python/dugong/files/3.3-test-timeout.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-https://bitbucket.org/nikratio/python-dugong/commits/0e9d67700bc8
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -99,6 +99,12 @@
-     request.addfinalizer(conn.disconnect)
-     return conn
- 
-+@pytest.fixture()
-+def random_fh(request):
-+    fh = open('/dev/urandom', 'rb')
-+    request.addfinalizer(fh.close)
-+    return fh
-+
- def check_http_connection():
-     '''Skip test if we can't connect to ssl test server'''
- 
-@@ -170,12 +176,12 @@
-     conn.get_ssl_cipher()
-     conn.get_ssl_peercert()
- 
--def test_blocking_send(conn):
-+def test_blocking_send(conn, random_fh):
-     # Send requests until we block because all TCP buffers are full
- 
--    path = '/send_100_1200-byte_chunks'
-+    path = '/send_102400_random_bytes'
-     for count in itertools.count():
--        crt = conn.co_send_request('GET', path, body=DUMMY_DATA[:8192])
-+        crt = conn.co_send_request('GET', path, body=random_fh.read(8192))
-         flag = False
-         for io_req in crt:
-             if not io_req.poll(1):
-@@ -539,7 +545,7 @@
-     conn.read_response()
-     conn.readall()
- 
--def test_aborted_write1(conn, monkeypatch):
-+def test_aborted_write1(conn, monkeypatch, random_fh):
-     BUFSIZE = 64*1024
- 
-     # Monkeypatch request handler
-@@ -562,14 +568,14 @@
-     # Try to write data
-     with pytest.raises(ConnectionClosed):
-         for _ in range(50):
--            conn.write(b'f' * BUFSIZE)
-+            conn.write(random_fh.read(BUFSIZE))
- 
-     # Nevertheless, try to read response
-     resp = conn.read_response()
-     assert resp.status == 401
-     assert resp.reason == 'Please stop!'
- 
--def test_aborted_write2(conn, monkeypatch):
-+def test_aborted_write2(conn, monkeypatch, random_fh):
-     BUFSIZE = 64*1024
- 
-     # Monkeypatch request handler
-@@ -590,7 +596,7 @@
-     # Try to write data
-     with pytest.raises(ConnectionClosed):
-         for _ in range(50):
--            conn.write(b'f' * BUFSIZE)
-+            conn.write(random_fh.read(BUFSIZE))
- 
-     # Nevertheless, try to read response
-     assert_raises(ConnectionClosed, conn.read_response)
-@@ -716,12 +722,13 @@
-     assert conn.read(50) == b'x' * 25
-     assert_raises(dugong.ConnectionTimedOut, conn.read, 50)
- 
--def test_send_timeout(conn, monkeypatch):
-+def test_send_timeout(conn, monkeypatch, random_fh):
-     conn.timeout = 1
- 
-     def do_PUT(self):
-         # Read just a tiny bit
-         self.rfile.read(256)
-+        time.sleep(2*conn.timeout)
-     monkeypatch.setattr(MockRequestHandler, 'do_PUT', do_PUT)
- 
-     # We don't know how much data can be buffered, so we
-@@ -730,7 +737,7 @@
-     conn.send_request('PUT', '/recv_something', body=BodyFollowing(len_))
-     with pytest.raises(dugong.ConnectionTimedOut):
-         while len_ > 0:
--            conn.write(b'x' * min(len_, 16*1024))
-+            conn.write(random_fh.read(min(len_, 16*1024)))
- 
- 
- DUMMY_DATA = ','.join(str(x) for x in range(10000)).encode()
-@@ -743,6 +750,14 @@
-     def log_message(self, format, *args):
-         pass
- 
-+    def setup(self):
-+        super().setup()
-+        self.random_fh = open('/dev/urandom', 'rb')
-+
-+    def finish(self):
-+        super().finish()
-+        self.random_fh.close()
-+        
-     def handle_expect_100(self):
-         if self.handle_errors():
-             return
-@@ -782,14 +797,17 @@
-             self.wfile.close()
-             return
- 
--        hit = re.match(r'^/send_([0-9]+)_bytes', self.path)
-+        hit = re.match(r'^/send_([0-9]+)_(random_)?bytes', self.path)
-         if hit:
-             len_ = int(hit.group(1))
-             self.send_response(200)
-             self.send_header("Content-Type", 'application/octet-stream')
-             self.send_header("Content-Length", str(len_))
-             self.end_headers()
--            self.wfile.write(DUMMY_DATA[:len_])
-+            if hit.group(2):
-+                self.wfile.write(self.random_fh.read(len_))
-+            else:
-+                self.wfile.write(DUMMY_DATA[:len_])
-             return
- 
-         hit = re.match(r'^/send_([0-9]+)_([0-9]+)-byte_chunks(?:_delay_([0-9]+)_ms)?',
-
diff --git a/dev-python/dynd-python/files/dynd-python-0.6.0-out-of-git-versioning.patch b/dev-python/dynd-python/files/dynd-python-0.6.0-out-of-git-versioning.patch
deleted file mode 100644
index 003091da3e75..000000000000
--- a/dev-python/dynd-python/files/dynd-python-0.6.0-out-of-git-versioning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt.orig	2014-02-10 18:35:07.332899916 -0800
-+++ CMakeLists.txt	2014-02-10 18:38:03.220956236 -0800
-@@ -86,8 +86,8 @@
- endif()
- 
- # Get the git revision
--get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_PYTHON_GIT_SHA1)
--git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_PYTHON_VERSION_STRING --dirty --match "v[0-9]*")
-+set(DYND_PYTHON_GIT_SHA1 "2eaece194769aa55b505274692bfaafa4ef68ac6") 
-+set(DYND_PYTHON_VERSION_STRING "v0.6.0") 
- message(STATUS "DyND-Python version: ${DYND_PYTHON_VERSION_STRING}")
- configure_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/src/git_version.cpp.in"
diff --git a/dev-python/enable/files/enable-3.3.0-nofreetype.patch b/dev-python/enable/files/enable-3.3.0-nofreetype.patch
deleted file mode 100644
index 56000986dff5..000000000000
--- a/dev-python/enable/files/enable-3.3.0-nofreetype.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- Enable-3.3.0.orig/enthought/kiva/agg/setup.py	2010-02-25 13:15:07.000000000 -0500
-+++ Enable-3.3.0/enthought/kiva/agg/setup.py	2010-03-21 14:55:37.000000000 -0500
-@@ -4,59 +4,6 @@
- import re
- import platform
- 
--freetype2_sources =['autofit/autofit.c',
--                    'base/ftbase.c','base/ftsystem.c','base/ftinit.c',
--                    'base/ftglyph.c','base/ftmm.c','base/ftbdf.c',
--                    'base/ftbbox.c','base/ftdebug.c','base/ftxf86.c',
--                    'base/fttype1.c',
--                    'bdf/bdf.c',
--                    'cff/cff.c',
--                    'cid/type1cid.c',
--                    'lzw/ftlzw.c',
--                    'pcf/pcf.c','pfr/pfr.c',
--                    'psaux/psaux.c',
--                    'pshinter/pshinter.c',
--                    'psnames/psnames.c',
--                    'raster/raster.c',
--                    'sfnt/sfnt.c',
--                    'smooth/smooth.c',
--                    'truetype/truetype.c',
--                    'type1/type1.c',
--                    'type42/type42.c',
--                    'winfonts/winfnt.c',
--                    'gzip/ftgzip.c',
--                    'base/ftmac.c',
--                    ]
--
--freetype2_dirs = [
--    'autofit',
--    'base',
--    'bdf',
--    'cache',
--    'cff',
--    'cid',
--    'gxvalid',
--    'gzip',
--    'lzw',
--    'otvalid',
--    'pcf',
--    'pfr',
--    'psaux',
--    'pshinter',
--    'psnames',
--    'raster',
--    'sfnt',
--    'smooth',
--    'tools',
--    'truetype',
--    'type1',
--    'type42',
--    'winfonts',
--    'gzip'
--    ]
--
--
--
- def configuration(parent_package='',top_path=None):
-     from numpy.distutils.misc_util import Configuration
-     from numpy.distutils.system_info import dict_append, get_info
-@@ -85,45 +32,11 @@
-         plat = 'x11'  # use with gtk2, it's slow but reliable
-         #plat = 'gdkpixbuf2'
- 
--
--    #-------------------------------------------------------------------------
--    # Add the freetype library (agg 2.4 links against this)
--    #-------------------------------------------------------------------------
--
--    prefix = config.paths('freetype2/src')[0]
--    freetype_lib = 'freetype2_src'
--
--    def get_ft2_sources((lib_name, build_info), build_dir):
--        sources = [prefix + "/" + s for s in freetype2_sources]
--        if sys.platform=='darwin':
--            return sources[:]
--        return sources[:-1]
--
--    ft2_incl_dirs = ['freetype2/src/' + s for s in freetype2_dirs] \
--                    + ['freetype2/include', 'freetype2/src']
--    ft2_incl_dirs = config.paths(*ft2_incl_dirs)
--    if sys.platform == 'darwin':
--        ft2_incl_dirs.append("/Developer/Headers/FlatCarbon")
--
--    config.add_library(freetype_lib,
--                       sources = [get_ft2_sources],
--                       include_dirs = ft2_incl_dirs,
--
--                       # This macro was introduced in Freetype 2.2; if it is
--                       # not defined, then the ftheader.h file (one of the
--                       # primary headers) won't pull in any additional internal
--                       # Freetype headers, and the library will mysteriously
--                       # fail to build.
--                       macros = [("FT2_BUILD_LIBRARY", None)],
--
--                       depends = ['freetype2'],
--                       )
--
-     #-------------------------------------------------------------------------
-     # Add the Agg sources
-     #-------------------------------------------------------------------------
- 
--    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ft2_incl_dirs
-+    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"]
-     agg_sources = [agg_dir+'/src/*.cpp',
-                     agg_dir+'/font_freetype/*.cpp']
-     config.add_library(agg_lib,
-@@ -137,7 +50,7 @@
-     if sys.platform == 'darwin':
-         define_macros = [('__DARWIN__', None)]
-         macros = [('__DARWIN__', None)]
--        extra_link_args = ['-framework', 'Carbon']
-+        extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first']
-     else:
-         define_macros = []
-         macros = []
-@@ -191,7 +104,7 @@
- 
-     build_info = {}
-     kiva_lib = 'kiva_src'
--    build_libraries = [kiva_lib, agg_lib, freetype_lib]
-+    build_libraries = [kiva_lib, agg_lib, "freetype"]
-     if sys.platform == "win32":
-         build_libraries += ["opengl32", "glu32"]
-     elif sys.platform == "darwin":
diff --git a/dev-python/enable/files/enable-4-rogue-tests.patch b/dev-python/enable/files/enable-4-rogue-tests.patch
deleted file mode 100644
index f08f7b00ce36..000000000000
--- a/dev-python/enable/files/enable-4-rogue-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur enable-4.3.0.orig/enable/savage/svg/tests/test_document.py enable-4.3.0/enable/savage/svg/tests/test_document.py
---- enable/savage/svg/tests/test_document.py	2013-03-28 21:58:28.000000000 +0800
-+++ enable/savage/svg/tests/test_document.py	2013-05-14 21:23:18.641569707 +0800
-@@ -63,6 +63,7 @@
-             0
-         )
- 
-+    @unittest.skip("This tests accesses the internet")
-     def testURLFallback(self):
-         self.document.state["fill"] = "url(http://google.com) red"
-         self.assertEqual(
-diff -ur enable-4.3.0.orig/enable/tests/kiva_graphics_context_test_case.py enable-4.3.0/enable/tests/kiva_graphics_context_test_case.py
---- enable/tests/kiva_graphics_context_test_case.py	2013-03-28 21:58:28.000000000 +0800
-+++ enable/tests/kiva_graphics_context_test_case.py	2013-05-14 21:24:53.897573114 +0800
-@@ -1,4 +1,3 @@
--
- import numpy as np
- import unittest
- 
-@@ -8,6 +7,7 @@
- class TestGCErrors(unittest.TestCase):
-     """Test some cases where a ValueError should be raised."""
- 
-+    @unittest.expectedFailure
-     def test_bad_image_size(self):
-         arr = np.array([[1, 2], [3, 4]], dtype=np.uint8)
-         gc = GraphicsContext((50, 50))
-diff -ur enable-4.3.0.orig/kiva/quartz/__init__.py enable-4.3.0/kiva/quartz/__init__.py
---- kiva/quartz/__init__.py	2013-03-28 21:58:28.000000000 +0800
-+++ kiva/quartz/__init__.py	2013-05-14 21:32:10.473588730 +0800
-@@ -2,16 +2,3 @@
- # :Copyright: 2004, Enthought, Inc.
- # :License:   BSD Style
- 
--from mac_context import get_mac_context
--
--
--def get_macport(dc):
--    """
--    Returns the Port or the CGContext of a wxDC (or child class) instance.
--    """
--    if 'GetCGContext' in dir(dc):
--        ptr = dc.GetCGContext()
--        return int(ptr)
--    else:
--        from macport import get_macport as _get_macport
--        return _get_macport(str(dc.this))
diff --git a/dev-python/fabric/files/doc-extensions.patch b/dev-python/fabric/files/doc-extensions.patch
deleted file mode 100644
index e426d6197b36..000000000000
--- a/dev-python/fabric/files/doc-extensions.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-releases module cannot be found and would cause un-needed d'loading
-diff -ur Fabric-1.8.3.orig/docs/conf.py Fabric-1.8.3/docs/conf.py
---- docs/conf.py	2014-02-15 01:28:56.000000000 +0800
-+++ docs/conf.py	2014-04-09 22:55:42.851674861 +0800
-@@ -26,7 +26,7 @@
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'releases']
-+extensions = ['sphinx.ext.autodoc']
- 
- # 'releases' (changelog) settings
- releases_issue_uri = "https://github.com/fabric/fabric/issues/%s"
diff --git a/dev-python/fabric/files/fabric-1.4.2-git_tags_docs.patch b/dev-python/fabric/files/fabric-1.4.2-git_tags_docs.patch
deleted file mode 100644
index 46e9044a45c6..000000000000
--- a/dev-python/fabric/files/fabric-1.4.2-git_tags_docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- docs/conf.py.org	2012-05-08 02:08:14.000000000 -0400
-+++ docs/conf.py	2012-05-10 10:06:28.000000000 -0400
-@@ -170,12 +170,13 @@
- html_theme = 'default'
- html_style = 'rtd.css'
- 
--from fabric.api import local, hide
--with hide('everything'):
--    get_tags = 'git tag | sort -r | egrep "(1\.[^0]+)\.."'
--    fabric_tags = local(get_tags, True).split()
--html_context = {'fabric_tags': fabric_tags}
-+#from fabric.api import local, hide
-+#with hide('everything'):
-+#    get_tags = 'git tag | sort -r | egrep "(1\.[^0]+)\.."'
-+#    fabric_tags = local(get_tags, True).split()
-+#html_context = {'fabric_tags': fabric_tags}
- 
-+html_context={'fabric_tags': ['1.4.2', '1.4.1', '1.4.0', '1.3.7', '1.3.6', '1.3.5', '1.3.4', '1.3.3', '1.3.2', '1.3.1', '1.3.0', '1.2.6', '1.2.5', '1.2.4', '1.2.3', '1.2.2', '1.2.1', '1.2.0', '1.1.8', '1.1.7', '1.1.6', '1.1.5', '1.1.4', '1.1.3', '1.1.2', '1.1.1', '1.1.0']}
- 
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the
diff --git a/dev-python/flake8/flake8-3.0.4.ebuild b/dev-python/flake8/flake8-3.0.4-r1.ebuild
similarity index 96%
rename from dev-python/flake8/flake8-3.0.4.ebuild
rename to dev-python/flake8/flake8-3.0.4-r1.ebuild
index 9dc4a498f686..b80756e3a65f 100644
--- a/dev-python/flake8/flake8-3.0.4.ebuild
+++ b/dev-python/flake8/flake8-3.0.4-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	!~dev-python/pyflakes-1.2.2
 	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
 	<=dev-python/pycodestyle-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy )
 	"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-restless/files/docbuild.patch b/dev-python/flask-restless/files/docbuild.patch
deleted file mode 100644
index 7e4c6550f962..000000000000
--- a/dev-python/flask-restless/files/docbuild.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-A number of these settings are simply unworkable in gentoo
-diff -ur flask-restless-0.11.0.orig/docs/conf.py flask-restless-0.11.0/docs/conf.py
---- docs/conf.py	2013-05-19 01:50:21.000000000 +0800
-+++ docs/conf.py	2013-06-10 23:39:05.741199580 +0800
-@@ -99,7 +99,6 @@
-
- # The name of the Pygments (syntax highlighting) style to use.
- #pygments_style = 'sphinx'
--pygments_style = 'flask_theme_support.FlaskyStyle'
-
- # A list of ignored prefixes for module index sorting.
- #modindex_common_prefix = []
-@@ -110,14 +110,11 @@
- # The theme to use for HTML and HTML Help pages.  See the documentation for
- # a list of builtin themes.
- #html_theme = 'default'
--html_theme = 'flask'
-+#html_theme = 'flask'
- 
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the
- # documentation.
--html_theme_options = {
--    'index_logo':       'flask-restless.png'
--}
- 
- # Add any paths that contain custom themes here, relative to this directory.
- html_theme_path = ['_themes']
-@@ -253,25 +250,12 @@
-      [u'Jeffrey Finkelstein'], 1)
- ]
- 
--
--# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'python': ('http://docs.python.org/', None),
--                       'flask': ('http://flask.pocoo.org/docs', None),
--                       'sqlalchemy': ('http://sqlalchemy.org/docs', None),
--                       'flasksqlalchemy':
--                           ('http://packages.python.org/Flask-SQLAlchemy',
--                            None)}
--
- # fall back if theme is not there
- try:
--    __import__('flask_theme_support')
-+    from flaskext import themes
-+    themes.html_theme = 'flask'
- except ImportError, e:
--    print '-' * 74
--    print 'Warning: Flask themes unavailable.  Building with default theme'
--    print 'If you want the Flask themes, run this command and build again:'
--    print
--    print '  git submodule update --init'
--    print '-' * 74
-+    print 'flask theme unavailable'
- 
-     pygments_style = 'tango'
-     html_theme = 'default'
diff --git a/dev-python/fusil/files/1.4-python25.patch b/dev-python/fusil/files/1.4-python25.patch
deleted file mode 100644
index b36643b5c4a7..000000000000
--- a/dev-python/fusil/files/1.4-python25.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 712796e..40ea469 100755
---- a/setup.py
-+++ b/setup.py
-@@ -17,6 +17,7 @@
- #  - set version to n+1
- #  - add a new empty section in the changelog for version n+1
- 
-+from __future__ import with_statement 
- from imp import load_source
- from os import path
- from sys import argv
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index fcec1cd4f52f..e03b1b909af5 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,2 +1,3 @@
 DIST guessit-1.0.3.tar.gz 1200782 SHA256 6de9149b663b415ebc1f4ab9f12eb624ca859cf13cc1a491382f56619f33f59b SHA512 be427d3ac5b598fe14b26b4fa41c3bd9c0cc946df85381c61be9180275b54f6beac9d433ba781f4351bf94eba5a53b1097d8503268efd9019d50beb60f92cfcb WHIRLPOOL 31b2bb0e57a395f38f7ebe2420945cf00e00149a8345db245c3978cebb6366b53b8b1eae89838d4729e1e8c15abef2f4c8c91f64e5eb3e6f36a56f54de715546
 DIST guessit-2.0.5.tar.gz 74464 SHA256 626e0024c5cca9b84883b65246e4f238e3f39064664486f69f086c853a63ff61 SHA512 6d02df5caebc0373ea0609b2ef4fa0b2ca2bedce62f5df3f1bdcf84808c09aff57f1c043704effedfb3ca4dbd4235f5a84c5580b1f2839f79933b40342309d2a WHIRLPOOL da5da3ac6a27f96714683acafe9664c316c522290cdd01308097c42fd55e8df16f735e54938c1e8b7b3c2531426d00b60c5361aedd8da8eea597fdc27a22b858
+DIST guessit-2.1.0.tar.gz 77587 SHA256 a534a46bef3bbac7b313a55744860a9ddd5b7fae6abb6f6ae8bbace2b3e973b1 SHA512 0acdfa75dab709cfab00772536404503865554f060052ddb05c120d019e4c70833a4af7a7a7401ca608a65a0e8927e61e11d10878ba77b51fc8f99b3950e2ec0 WHIRLPOOL eafc863bddda4f63a22b9088ae7eba3d9ce7c56f82b25d5e0a6c84e6c20a877906d651acf04cd9d5243ebd32ac73064c2e96c2ae83226fbe814e2831cebaf590
diff --git a/dev-python/guessit/guessit-2.1.0.ebuild b/dev-python/guessit/guessit-2.1.0.ebuild
new file mode 100644
index 000000000000..2661caa6e01a
--- /dev/null
+++ b/dev-python/guessit/guessit-2.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.7.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index f885402d501a..50ad5107601e 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -19,9 +19,8 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-0.7.3[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.7.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/hgtools/Manifest b/dev-python/hgtools/Manifest
index b0b9645b9312..baee02e19eda 100644
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@@ -1,3 +1,2 @@
 DIST hgtools-6.0.zip 37542 SHA256 14f3f4d94827c2d45e5a05ffd6efbe2484f662354a3dce2d8d1a29df1b05dd5a SHA512 86443caa03ff5c8fe3b2f5d503c8d28ddc8e29f4818fb7d3b51233b79eb4977c98bd83ccdba0612c3c17ecddacd6d7c7b283dc6ffc935eeb7a5b1a099324e9af WHIRLPOOL d8517f2b6a769201246a5072c971880b4ae52cdfc8aec2f619cd642337eb3cfdf5abee06aa91792a8380c0d81f9a68949a9efa3f44a29a3218b8d9bea8601802
-DIST hgtools-6.3.zip 39805 SHA256 1d0ef6ceaba1673e6923b17d7f09c5ae2f4394d16ef80562812987a27e7836ff SHA512 b5654194f6fbaf37c2a63523b02371ca6af1d7b7f7a89938ba4e405076049a054fff5e6d0d4a8b53560cde7dfc4a1862c5359d710d91c208dd83611913f17a7f WHIRLPOOL efe5bca6ce0970f0199b5c757dd8fd0bd4a03ad64f4ef571e4dbae311afd22c753aa6831fc688718cbc8ef037700a3b81220dae318f82a0ea9fe4d4179cfe4e3
 DIST hgtools-6.5.1.tar.gz 22389 SHA256 638a29345707569944459b063763a00c2a3651bc489b1e0dfe0d1d6f3c3c518f SHA512 7a9cd405f4e3f49c57b89e85bca1dff6bfcce91c86a1f006f4223c23a82b13b57468c583815719b9c7e6189070381cf9345c3b7b06d9ed83cf1ed6994293c130 WHIRLPOOL 53f56ab71dca4ed824f84670b9f93e68b827453bb99075f4e2af684ef121fe27d011409819b604d233ea6660f4194c6807d2133f7f819da6d74a732952d322f4
diff --git a/dev-python/hgtools/files/hgtools-doctest-2.0.2.patch b/dev-python/hgtools/files/hgtools-doctest-2.0.2.patch
deleted file mode 100644
index 328e6eee54bd..000000000000
--- a/dev-python/hgtools/files/hgtools-doctest-2.0.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hgtools-2.0.2/hgtools/versioning.py	2012-10-09 10:35:38.000000000 +0800
-+++ hgtools-2.0.2.new/hgtools/versioning.py	2013-05-04 16:45:14.883913556 +0800
-@@ -60,7 +60,7 @@
- 
- 	def as_number(self):
- 		"""
--		>>> str(SummableVersion('1.9.3').as_number())
-+		>>> str(round(SummableVersion('1.9.3').as_number(), 12))
- 		'1.93'
- 		"""
- 		def combine(subver, ver):
diff --git a/dev-python/hgtools/hgtools-6.3.ebuild b/dev-python/hgtools/hgtools-6.3.ebuild
deleted file mode 100644
index fd495927a74d..000000000000
--- a/dev-python/hgtools/hgtools-6.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
-HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
-SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-vcs/mercurial"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	py.test "${PN}"/tests || die
-	popd > /dev/null
-}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 20641992bf07..0511293a0738 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,4 +1,2 @@
-DIST keyring-3.7.zip 89249 SHA256 e187358e6a9b8e63cc2e223f6f9d4c40c972c0076f4aa0d65b8c9eb75edbea02 SHA512 7343d40566484b33e3f265d874d75fcf502dbc0abfd653db65536ca4d475fc5596ba23a6472467b88b589fca740f62860a39d18ad7a285696b4cc2c79abe2729 WHIRLPOOL 79967660e4db75f4a89ebc462ee4cb73b3b261bdfc9666979f7a08cfcac6a04b2cbe975b0467155b8b159c630bdf938afcc5d9a3ab25928abfaf54cf6b233844
 DIST keyring-8.6.tar.gz 38526 SHA256 92b28d9713ed77bc157680e95a3643a5777f5c3e0690e772c2f2da7df81ce46d SHA512 a139736381ee706da1c5456259ce0ca07d4079003f2eb90bab6b3dc4b8ff6b7bf68a907427f1f4014e861e2222d697bbbc89f7fa68a3b53507632d3f668b8bc0 WHIRLPOOL f242f7b5b4c5f22cddc82ee97223aa55d25d85bdb81ccb139571d434a9b4bb5ceac85395a94e7e95491a1ad19d1bd58681a51f9af58fd6350744f88411fa538a
-DIST keyring-9.2.1.tar.gz 40150 SHA256 c742a3684a5e4f41793fa079eee8e1299d749979ea44a20a5a83db7cbc742a3b SHA512 65109e8b3e11bb1af743087cca3bdb5d74b9eea204ce9da8138f60b2bfd2e75b4c79990f0903543855967ba6d9496c816c914ffbff6aee2b9e58a407c0d6cf73 WHIRLPOOL 7cf33715731582d987d37c6fef7ecf4d0d8df24418075d6ccade2e798eb03460e34717a9d0f10d3b3e8afd6ee6dde419cb7ac8ed9e4eb8e61217d3044f537cc7
 DIST keyring-9.3.1.tar.gz 40579 SHA256 3be74f6568fcac1350b837d7e46bd3525e2e9fe2b78b3a3a87dc3b29f24a0c00 SHA512 b899e45e479806e9d01cb490925e291608dfa32bdac212a09922c2fa11196bf18b3ccdefd05aa3777588df43f1dbc5352d6705b93cae23bc7525c727254a938c WHIRLPOOL 5e0213331bafa0e387129f6ae705835cfb01aac3daadd2e142b3ebccc9b6bde1c2ebf7ba30610a89bbcffe728f1fc6efa42227ab2afccef81144ec3d0a7cc935
diff --git a/dev-python/keyring/files/setup-1.0.patch b/dev-python/keyring/files/setup-1.0.patch
deleted file mode 100644
index d510c6376aaf..000000000000
--- a/dev-python/keyring/files/setup-1.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- setup.py	2012-11-29 11:01:22.000000000 -0500
-+++ setup.py.wanted	2012-12-27 23:55:56.679344322 -0500
-@@ -39,17 +39,6 @@
-     return True
- 
- 
--test_requirements = [
--    'pytest',
--]
--"dependencies for running tests"
--
--if sys.version_info < (2, 7) or (
--        sys.version_info >= (3, 0) and sys.version_info < (3, 1)):
--    # Require unittest2 for Python which doesn't contain the new unittest
--    # module (appears in Python 2.7 and Python 3.1)
--    test_requirements.append('unittest2')
--
- setup_params = dict(
-     name = 'keyring',
-     version = "1.0",
-@@ -74,11 +63,6 @@
-     platforms = ["Many"],
-     packages = ['keyring', 'keyring.tests', 'keyring.util',
-                 'keyring.backends'],
--    extras_require = {'test': test_requirements},
--    tests_require = test_requirements,
--    setup_requires = [
--        'pytest-runner',
--    ],
- )
- 
- 
diff --git a/dev-python/keyring/keyring-3.7.ebuild b/dev-python/keyring/keyring-3.7.ebuild
deleted file mode 100644
index bb3c242999ad..000000000000
--- a/dev-python/keyring/keyring-3.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} pypy)
-
-inherit distutils-r1
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://bitbucket.org/kang/python-keyring-lib"
-SRC_URI="mirror://pypi/k/${PN}/${P}.zip"
-
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		app-arch/unzip
-	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycrypto[$(python_gen_usedep 'python2*' 'python3*')] )"
-RDEPEND=""
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-9.2.1.ebuild b/dev-python/keyring/keyring-9.2.1.ebuild
deleted file mode 100644
index ab7471ad9b9b..000000000000
--- a/dev-python/keyring/keyring-9.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 6e14536f840c..020aed13bd51 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,2 +1 @@
-DIST keystoneauth1-2.4.0.tar.gz 151550 SHA256 4d7fda675f47cab4456f0a4bae91899b37f38d540a6f0972a93935c75df8cb53 SHA512 69614a96cddfa6652ba5ca0abcd44305be605c1b1359a62aadc8e5315a9ddb3442eef677688e8646feaab0d184d4a9c96071effb1b2b9044b7362c1727868ab6 WHIRLPOOL 91994ee1639e5f8da3a85560a53b61fa71ed8653d11ff897b05d06c7c3fb06b38803e0488fdbc9d8b953284f2b2a2fd7c6136a38f1aa3b4e669fb5daf044c69d
 DIST keystoneauth1-2.4.1.tar.gz 150586 SHA256 61a2f4cf374b55f10a0d8250a532ccb93dff2ea81994ced15b2a34af055d4e78 SHA512 f9e8fcea7b23001b907d643d5bf67fc4779c8729cca213b3240ef988eda9de1212b15c2031f6fd8b431aafac85e773346eda71e0b414fe967728611b6817fb05 WHIRLPOOL 42644ede5c0db10ffe77ef106d78764dcb49d455dbc09e3660160b9d7a9eb3453118f6777469f9779e2fca34eb9e09cf3ef759f2f27cc38b8dca8520b9febd43
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
deleted file mode 100644
index ebaae9bc60ce..000000000000
--- a/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +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_3 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
index fa1557e802fc..ebaae9bc60ce 100644
--- a/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 2be64ccd8f6c..9807f7ec0002 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,5 +1 @@
-DIST keystonemiddleware-2.3.1.tar.gz 181764 SHA256 9970f8187cb0a91cb2d78ef9a088147b2c9457653e95caa7b8bcd11bd450bec1 SHA512 976aece1d308607eec6f406bb94f1e6dddc27edebc8d99bd7bc00dfbc1f21479da2c76404a99eb677e6647afd42f68b82d6f519659d7483db6fa9d68f839cf5f WHIRLPOOL e6a568e7c96886907eaeba9bc843833ffece8f441bfbe760b77c597c38a5a2720b702a527830d61f07bf0e3adbe4a90d6198b97b487ca08c3e4829058f7e0ef4
-DIST keystonemiddleware-2.3.2.tar.gz 180429 SHA256 ba4a3bc6224d8ba85319741034d3c6f0c569096e38c6f75a5f044b1c742feeb3 SHA512 ef3a36cd8daa2456b960b9677f06d3753ed3eb7bad83b5d32a1fb2e69239237a495649b5c8138b92b1ab2b6b8e7a8db9e1d02dd7c595962f82681c478e5dfb78 WHIRLPOOL 846b4efdb61a0680d6a71cfe7605c88c3e908c0391b974ba6517c0122a2720bbc5b8990c41907a306ace5d0d25f9362260acc44dfd8e7c9e8dcf6b19213fcda8
-DIST keystonemiddleware-2.3.3.tar.gz 185140 SHA256 3a71fdd81d835dbf95086df29bed4f72a05f6588a193ee207877cdb954b9d155 SHA512 cc5a9d5d7411e59471993deff33e71198fe0124252f668e01dc32f84dd2cec56a3256c3a1f05c5f9ed15c25598472fce79a26809ed34123ad10fb90aa8bfde7a WHIRLPOOL 88cf95922b4f32e673b0c77ee95a4effc2f0a65aa3118d5e49c0f25ba83e356bd1af4aa05efe71dc69c1bc3453fea132eab3c53d24815edf1aebcebe01beeaa2
-DIST keystonemiddleware-4.4.0.tar.gz 196504 SHA256 65d574c0bfcd0152391ce5d32261702f9e44736c3c80f22447961d682ebc8367 SHA512 0f42d5d28b81538d4ee8ecaa563d671dd62b19162661edc3959b564bc6143750f31f6946aae494c42934f78954b9861c45212f4f19c1460b73351f1ab9dafc4b WHIRLPOOL 81c94eb7e9b72e46ca1312af800ab131a12aa3ee32318e1181fbfdfdf540e8a3a5c1348217b3967b50efcfc05c67412f208bec15e19de5e46f42d40112ac0908
 DIST keystonemiddleware-4.4.1.tar.gz 194711 SHA256 dff35f0e4acb77f34c9c880bd4f456bbe26a1c4701815d82e8c27ff74a5dfb52 SHA512 c04383836740222d49324cb5f25f8b156424abaa74ac9482a2deb2e1d54cc6d990a864451a075bc12c3d7d38da7235f236e8a8cfb4c3748953c14a4505eeb99f WHIRLPOOL 76a96e6140752cd8eb1d060591c5dec1181abf873c82595be89d9597e3c3e5d3344739fab6b8d0058ae2ab47863e5169d4bbcb4a83f46a24dea042c0ccfac8d0
diff --git a/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch b/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch
deleted file mode 100644
index 6ea8f99d5c3c..000000000000
--- a/dev-python/keystonemiddleware/files/cve-2015-1852-master-keystonemiddleware.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/keystonemiddleware/s3_token.py b/keystonemiddleware/s3_token.py
-index d56482f..3fe13f9 100644
---- a/keystonemiddleware/s3_token.py
-+++ b/keystonemiddleware/s3_token.py
-@@ -35,6 +35,7 @@ import logging
- import webob
- 
- from oslo_serialization import jsonutils
-+from oslo_utils import strutils
- import requests
- import six
- from six.moves import urllib
-@@ -116,7 +117,7 @@ class S3Token(object):
-                                             auth_port)
- 
-         # SSL
--        insecure = conf.get('insecure', False)
-+        insecure = strutils.bool_from_string(conf.get('insecure', False))
-         cert_file = conf.get('certfile')
-         key_file = conf.get('keyfile')
- 
-diff --git a/keystonemiddleware/tests/test_s3_token_middleware.py b/keystonemiddleware/tests/test_s3_token_middleware.py
-index fdadb76..4b910a6 100644
---- a/keystonemiddleware/tests/test_s3_token_middleware.py
-+++ b/keystonemiddleware/tests/test_s3_token_middleware.py
-@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
-     @mock.patch.object(requests, 'post')
-     def test_insecure(self, MOCK_REQUEST):
-         self.middleware = (
--            s3_token.filter_factory({'insecure': True})(FakeApp()))
-+            s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
- 
-         text_return_value = jsonutils.dumps(GOOD_RESPONSE)
-         if six.PY3:
-@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
-         mock_args, mock_kwargs = MOCK_REQUEST.call_args
-         self.assertIs(mock_kwargs['verify'], False)
- 
-+    def test_insecure_option(self):
-+        # insecure is passed as a string.
-+
-+        # Some non-secure values.
-+        true_values = ['true', 'True', '1', 'yes']
-+        for val in true_values:
-+            config = {'insecure': val, 'certfile': 'false_ind'}
-+            middleware = s3_token.filter_factory(config)(FakeApp())
-+            self.assertIs(False, middleware._verify)
-+
-+        # Some "secure" values, including unexpected value.
-+        false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
-+        for val in false_values:
-+            config = {'insecure': val, 'certfile': 'false_ind'}
-+            middleware = s3_token.filter_factory(config)(FakeApp())
-+            self.assertEqual('false_ind', middleware._verify)
-+
-+        # Default is secure.
-+        config = {'certfile': 'false_ind'}
-+        middleware = s3_token.filter_factory(config)(FakeApp())
-+        self.assertIs('false_ind', middleware._verify)
-+
- 
- class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
-     def setUp(self):
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
deleted file mode 100644
index c56c57bf18d4..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,83 +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_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/CVE-2015-7546_2.3.2.patch"
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
deleted file mode 100644
index b1c565ed44f1..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,88 +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_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/CVE-2015-7546_2.3.2.patch"
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.3.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.3.ebuild
deleted file mode 100644
index e318c0c7fcd9..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.3.ebuild
+++ /dev/null
@@ -1,93 +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_3 python3_4 )
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
deleted file mode 100644
index 0d7402f1ccde..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
+++ /dev/null
@@ -1,86 +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_3 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.17.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/.)
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
index 639a76740257..a2215eecc0e1 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index b2f8629de1f6..ac1be133fae3 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,3 +1,4 @@
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
 DIST matplotlib-1.5.0.tar.gz 53962448 SHA256 67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 SHA512 559a3ef031ca65b431157f0dd50f7d81f2d854f92150ee2b9de5e44b31d49615bfdc049a682667bc2e1399b8cd724dfcefec8f4de7e92848fe5756f93ddef5fa WHIRLPOOL b30a7299dd0690cd0355883cbe7d335d76314bab85f5b67b326b0e600b479db3cd5e7f48e9e68d3604832e9605f5025c70ff0006b1980b945aeaf22f78e3469f
 DIST matplotlib-1.5.1.tar.gz 54031672 SHA256 3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40 SHA512 a0e78b5027a3a49cf8e77dc0d26f5f380dcd80f7b309b6121199acd5e1d94f48482864a9eee3bd397f7ac6f07fe1d3c21bf517217df3c72e8e3d105b7c2ae58e WHIRLPOOL 5d56b1e17542d01ea58cbe6a085fae930dd71dac793260fd418633d1364ab7822d5a0ef16041260637f2472b1d9276c002f84603ab655573b7d8058d959475cd
+DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch b/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
new file mode 100644
index 000000000000..bc6891a5f252
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
@@ -0,0 +1,26 @@
+Increase the tolerance margin in order to pass tests caused by
+freetype producing unreproducible images across different versions.
+See also: https://github.com/matplotlib/matplotlib/issues/2667
+
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -158,7 +158,7 @@
+ def make_set(basename, fontset, tests, extensions=None):
+     def make_test(filename, test):
+         @image_comparison(baseline_images=[filename], extensions=extensions,
+-                          tol=32)
++                          tol=40)
+         def single_test():
+             matplotlib.rcParams['mathtext.fontset'] = fontset
+             fig = plt.figure(figsize=(5.25, 0.75))
+--- a/lib/matplotlib/tests/test_text.py
++++ b/lib/matplotlib/tests/test_text.py
+@@ -18,7 +18,7 @@
+ from matplotlib.backends.backend_agg import RendererAgg
+ 
+ 
+-@image_comparison(baseline_images=['font_styles'])
++@image_comparison(baseline_images=['font_styles'], tol=20)
+ def test_font_styles():
+     from matplotlib import _get_data_path
+     data_path = _get_data_path()
diff --git a/dev-python/matplotlib/matplotlib-1.5.3.ebuild b/dev-python/matplotlib/matplotlib-1.5.3.ebuild
new file mode 100644
index 000000000000..2afda5b9ff88
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.5.3.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~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) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/qhull
+	cairo? (
+		|| (
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/cairocffi[${PYTHON_USEDEP}]
+			)
+		)
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		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_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.3-freetype-spurious-failure.patch" )
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	# suggested by upstream
+#	sed \
+#		-e '/tol/s:32:35:g' \
+#		-i lib/matplotlib/tests/test_mathtext.py || die
+
+	sed \
+		-e "s:/usr/:${EPREFIX}/usr/:g" \
+		-i setupext.py || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = "${EPREFIX}/usr"
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		agg = True
+		$(use_setup cairo)
+		$(use_setup pyside)
+		$(use_setup qt4)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if $(python_is_python3); then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			six = True
+			fltk = False
+			fltkagg = False
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			six = False
+			$(use_setup fltk)
+			$(use_setup gtk2 gtk)
+			$(use_setup gtk3)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	export MPLSETUPCFG
+	unset DISPLAY
+
+	# Note: remove build... if switching to out-of-source build
+	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+#	virtx ${EPYTHON} tests.py \
+#		--no-pep8 \
+#		--no-network \
+#		--verbose \
+#		--processes=$(makeopts_jobs)
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 850b7d7c9f91..b8e62b592c1b 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,3 +1 @@
 DIST os-client-config-1.16.0.tar.gz 53367 SHA256 d25dfb1b74552339442875bedb1e9328de66c5644b8dff0b31cc140f1d6ac9fd SHA512 a10a877dd3bc0245c6bbdaa0cb6daa5a17b519cc4fa73b368626a2e58dd44427309e1d839a3db14128ab4ed4d12fd36aaf366617ded88e14335ced8929c7f527 WHIRLPOOL 58fa3908c9ab756a610e4ce9cd99bf4f0e33602a79a773b71b8c5d5677c251d92b0e13ae33bf5d7ce9c671f672e0edef3d5780d9d806e8c72a2790f369ad5724
-DIST os-client-config-1.6.1.tar.gz 28783 SHA256 24323a33fe4ec4ff0c71a91aa16d26f4c4320f0b0234c5ac22d08f99e2f5c24d SHA512 3f71b17d70f2e7a75e6530203f84a5d32d9bb8c517d1379033ad5fb1d864bcb58c2b026bd2f177fe415b6c03498518bb5abb23df710c66ffd828619aeaf2a4f4 WHIRLPOOL 326c912ae153ad0bcbc7988743be880cb4b7be17762fee8a7ae82946f3502ca9085d0f17726c7d5f7aec4a81968d134674dfc55de3a14d91773279c66db445cb
-DIST os-client-config-1.6.3.tar.gz 25695 SHA256 c7bf7c91bd99e9501a6a2e5415ce4026f0d022d5df9d6123bc935db6108a423f SHA512 411e32c38fec5146eaf01c9fa0f7e1c5ff61c35847604ae2d3a4316a06bfc1b86be83166bf6cd0debef3a352483ee9119471e7a535ff01e264c42f516499b3b4 WHIRLPOOL 5799f8f4ac684e389888c0f5511d5c11ae39dde038d53b74deb29508b0d631cb17e72ea94bf4a343c5f7816aae5f92e19c53d490f46f40c723be69b82d543c65
diff --git a/dev-python/os-client-config/os-client-config-1.16.0.ebuild b/dev-python/os-client-config/os-client-config-1.16.0.ebuild
index 44dc03c8d33a..1f6d1ca1bbe9 100644
--- a/dev-python/os-client-config/os-client-config-1.16.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.16.0.ebuild
@@ -31,7 +31,6 @@ DEPEND="
 		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
@@ -40,7 +39,6 @@ DEPEND="
 	)
 	doc? (
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/os-client-config-1.6.1.ebuild b/dev-python/os-client-config/os-client-config-1.6.1.ebuild
deleted file mode 100644
index 1ef8b3f3bd17..000000000000
--- a/dev-python/os-client-config/os-client-config-1.6.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Client Configuation Library"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/extras[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/test_get_all_clouds.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/os-client-config/os-client-config-1.6.3.ebuild b/dev-python/os-client-config/os-client-config-1.6.3.ebuild
deleted file mode 100644
index 0e3ba52cb6b0..000000000000
--- a/dev-python/os-client-config/os-client-config-1.6.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Client Configuation Library"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-CDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/extras[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/test_get_all_clouds.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 213f67bfa974..be5f302d13be 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1 @@
-DIST oslo.concurrency-1.8.2.tar.gz 53278 SHA256 149f4c972916f14c14c97d7be7b92ba59497c1bbd09c114ee3681bef0773daca SHA512 b73b52cef9dca932b8d0b737bd544f0a6d138de701aa9d2309d6e7698af337e4aea5cbb47c78c2ebda14abc164b8cc2b40fee6c8e92a30ee674318f436cf3b94 WHIRLPOOL 1ad6cc6dc0d339b2bec4959539fdadfb0914b1677005e250b4e74da3be97310474d20514003b0c0f50a4c6dff021ac8efa25e1f9b4502f419ab9763117caa16e
-DIST oslo.concurrency-2.5.0.tar.gz 35903 SHA256 279c7cca885f69cfb7b3b50d686cd3d7c8d50dfb8eb13aada01bf733ef5ccc45 SHA512 866c3b7ea938c2b1fed7a004a34398b99fd6b084ca3c709a8448464f4845445a16fc1a016ea30b391190625ac53bf6756509dfbee28c89000f689743622246e0 WHIRLPOOL 0067b6d3089d94c41491e5e208392bad7cd7eebb9d7ba9c5300b985cfbad924273c30ec575674ba2177fe4ba3b17fe2dcd709c778753b013989bfb285070aa2b
 DIST oslo.concurrency-3.7.1.tar.gz 39914 SHA256 254a42d9f0a5f21e9d56e5fd5ca7c3e355ba22d06ea47f6eb094155242ccc0f6 SHA512 8146f22c06fd75202d0bae75a99e77a613675359cab1f6221ff68f89035b105cc6d96b6a1d8013c983a94166d826fbeaa4502fd307af9707d0a1462db678fb4f WHIRLPOOL 03c55b366199e0c7a2af895fe0ad3a769778be58382ee5a40ce1e0220f80bb6273b8615d7fc295f1e25111487772291597dfc8a54ebdbe44deff68ab94916923
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-1.8.2.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-1.8.2.ebuild
deleted file mode 100644
index ce7705c8c813..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-1.8.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/futures/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
deleted file mode 100644
index f51ff2879099..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index a8afcf38a458..44674f1abbec 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,4 +1 @@
-DIST oslo-config-2.3.0.tar.gz 77781 SHA256 780258c0910995a0f092b64144c160e6fe649b3fe7a058b3457f6111718a3088 SHA512 91e9c4d5c4b6c43c4e2614285714186b202a392d2e7b917aa4ce4f9c8d0c42780eb9b6ac42d3ca5d7944a79f90966edf4c6ed3b709cc6743f2bee437d513957c WHIRLPOOL e0260e8e91774104c29f46474c70167bc2567a442872bf723f7f8ad1caa52fe0b4ec9a792a8d695b114ec98db25d5ca85ec66fa840baff3a37b9f802f376b3f2
-DIST oslo-config-2.4.0.tar.gz 78301 SHA256 6116c973f53f33659285f844fa4f5bdaded8850bed0a7686b2d081e5243a278f SHA512 c63a2f361cc197c9bbf47c647abab45cb094808eeb4bc7647e80fb19ff6d6b32f59c570f63c3d0a4b18f0c5ef9dd73a37ce307b8d616398ba60d8b0784764897 WHIRLPOOL 0339b794e008b72724e9b2104f13117eda339b103715fcda1e1c5f4e001f413f324f48043dc735a9e018734c2363a9741841eb50b346cd94e6e9469bbb692b51
 DIST oslo-config-3.9.0.tar.gz 99255 SHA256 ec7bdf4a3d85f90cf07d2fa03a20783558ad0f490d71bd8faf50bf4ee2923df1 SHA512 c52d1ed16149a57748e81d4eed192636fc726a4f373cb5c5d7a1bcdbe43a0339f733f94a3d922aa85c6248749b69da06d6c671a152d301510603f50913176b1c WHIRLPOOL af288fc5b5c5fef3f6c5e128585355bf0624b9fc11519c679bb2d3399a67e5935510c677ef6d714c562197260081e9fbc7e8fc7b6cebcd7aa757eedf8b17eb2e
-DIST oslo.config-1.9.3.tar.gz 94155 SHA256 ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140 SHA512 e4daa78bb82593806221c143b374ffcbba49bad5f6a7994703febf24918fe728fdf0e4f9c8e7eeebfd78acd3fe2b4e483d56e1249f0c81970d0f760a9e71f179 WHIRLPOOL a921908faa3a0f2a38fd5565cc7252f7dbd5c5074b48bfaee349984ccd81c20625940a9ea616f71bf3fe111c8ddb5e15fa398ba677521ba21173a6a52a70ab33
diff --git a/dev-python/oslo-config/oslo-config-1.9.3.ebuild b/dev-python/oslo-config/oslo-config-1.9.3.ebuild
deleted file mode 100644
index bcc1600c1d56..000000000000
--- a/dev-python/oslo-config/oslo-config-1.9.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.config/oslo.config-${PV}.tar.gz"
-S="${WORKDIR}/oslo.config-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-config/oslo-config-2.3.0.ebuild b/dev-python/oslo-config/oslo-config-2.3.0.ebuild
deleted file mode 100644
index b275cba27006..000000000000
--- a/dev-python/oslo-config/oslo-config-2.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^argparse/d' requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-config/oslo-config-2.4.0.ebuild b/dev-python/oslo-config/oslo-config-2.4.0.ebuild
deleted file mode 100644
index 17d7d1456985..000000000000
--- a/dev-python/oslo-config/oslo-config-2.4.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^argparse/d' requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 07d2f50ecbf1..d27550463e0b 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1 @@
-DIST oslo.context-0.1.0.tar.gz 12320 SHA256 0340e533033607c18ce6a305d92f38a71fd89aaf439bf45074fd4ba9ee086971 SHA512 3e2e2cab4d5efbf8385277ac33d2babad3054b22713b3f343a47644c4420b1034e7711d353990116d2e149383293ba5a1ab1fe9247b42bf119705f5006e1a5b0 WHIRLPOOL 61b8b1be44213a8f1520c29de80adffd1341a3d3278fce0c7fc0bd50165a5b6793aaf6d62ea7685871cf20b59b922d773d3e67fbc26e3d7d13ef01773cbd8e7d
-DIST oslo.context-0.2.0.tar.gz 12726 SHA256 30bee9680a2bf5f947227cfd5996cebb17fd8c8e3013e5a594f7a7accb2947dd SHA512 afc1cf80a97bb90386750719e8314801057bf75c7cab1c2689d774bb337944cff324dc3737931f78b24bbf686ba4b5bbcb1e1ac1aae5347e700fd148556e6881 WHIRLPOOL 99dc8b37c582befbb9b32c26d8d106eb89bd9ef561193bc2cbf22c5ed0c2470f0f60a79bd06f9390866849eab2e65525ced9c8974c330ff5df2df3b5f3261e82
-DIST oslo.context-0.3.0.tar.gz 13108 SHA256 5ac98e1bf0f502de8f31d4ae397ce6b663beab26870e9f9a80d231400353b9cb SHA512 3a6cb17ec85b159d3bc496d3acfcfd7f03e92f32e5483c79be391d45a2af88ceb3c8ec2aae6714ac75f66b6664e3260a1e29c6f14c6802e8fa156f303b943ffa WHIRLPOOL c511b7470c09281402809af78ff7bd57d6ca241ab15736c876a9f705c08da8c7b5ce3dccd1867325e7b2052e83aec4fdd9fd9a32a9bd05f68ad10ccb4a9983cc
-DIST oslo.context-0.6.0.tar.gz 12684 SHA256 0655075480c7bc1f01977f3b13463746fd48498b9884a535498b0e36334e999b SHA512 8baf0de0be92bf061f6040d57c4121c1251a329844d341b333bf1c32398aa84313459e1d402dbee09efe8d1271306cc7e095d41e56f6711dec8f11bd086faacb WHIRLPOOL 616d9b76823cdfd9531203a5927160d1fd9b51364d64a70234cc91b3616bc486c5c05ef511cf4363e6c05193e598d885ac61896d7c260f143af236437f51a03b
 DIST oslo.context-2.2.0.tar.gz 16981 SHA256 8c9fbbf56d3f37cf00a039cac3455cffeb6588f61537e36a36ce9447c4be72ec SHA512 f4ccb7a5e652a4820fb40e538a631c11be5f978de2219dc923e18559d30625a31e0ca031f095ce2e0545290cdfdeb714fcf086add6b5a7eb2413ebd1e7a25875 WHIRLPOOL a9a5685dd62105ddaee9c48fdc96231ea700ab8821e7e918920afc1bdf1f1a0e36aa1845c9665bf753fb56d95005f69d4927b12aac9712f41f43e2d89682beaf
diff --git a/dev-python/oslo-context/oslo-context-0.1.0-r1.ebuild b/dev-python/oslo-context/oslo-context-0.1.0-r1.ebuild
deleted file mode 100644
index 909485b5837f..000000000000
--- a/dev-python/oslo-context/oslo-context-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.1.0.ebuild b/dev-python/oslo-context/oslo-context-0.1.0.ebuild
deleted file mode 100644
index 82e864ef7150..000000000000
--- a/dev-python/oslo-context/oslo-context-0.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.2.0.ebuild b/dev-python/oslo-context/oslo-context-0.2.0.ebuild
deleted file mode 100644
index 02d568716e2b..000000000000
--- a/dev-python/oslo-context/oslo-context-0.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.3.0.ebuild b/dev-python/oslo-context/oslo-context-0.3.0.ebuild
deleted file mode 100644
index 91d2d350a1e4..000000000000
--- a/dev-python/oslo-context/oslo-context-0.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.6.0.ebuild b/dev-python/oslo-context/oslo-context-0.6.0.ebuild
deleted file mode 100644
index a300cc41972b..000000000000
--- a/dev-python/oslo-context/oslo-context-0.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.context-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# This time half the doc files are missing; Do you want them?
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 31a49978e583..3391e1da7ab8 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,9 +1 @@
-DIST oslo.db-1.0.2.tar.gz 90060 SHA256 7092525eab0352748fc0c58a7facd3d6ae967d9130589b4afc12bfa171bee837 SHA512 77412e531f93966229c6cb866f34cb22c9b97e419f6035f0cb51a093ed218277aed85bf6b8a684b68ceb212ca9f17b0bda8073601cc4a569c3503d2dd1b59311 WHIRLPOOL ccde39e352adf7916b73b9883da1ef3aa99ce862d3dbd4b3ce86c058118cd49a43a50918237e0fb13ce7655cc6a88b3f745a5aee47af9af9e2a431dbb6cd4714
-DIST oslo.db-1.4.1.tar.gz 127166 SHA256 e1fc76e17db9552c42ddca7b95ef8dce9a2049c68b90c0130ed2e27c7a9d82fb SHA512 138bef9fb82d08be9f2d13061689f6f2af7f16e75968d51e423d58a0c6a5bcc12b13a3849dbb0862789256f737e9c3e72be844125bd2cdcfcce0df91b8694ecc WHIRLPOOL 7a98eae42a620699518415f191af4099b4d2cfc8d68392b2d5ae29e90d2f501670110bf19edfd223a55f52b078cb7c26125f7e99fded99eb52715a45afd578d0
-DIST oslo.db-1.7.1.tar.gz 134351 SHA256 21ceab26d3fe4f69e8ec3a7444cff2f13bc8a6e298cc8ffbfbe965f782931b74 SHA512 02f48ec51c4af4eaa76d2ead7c73f5748b6f8340d7d9d304334f44b718b6aa8f841cc7b48166521f6ca6d93d8ee2a33d06570ec99b8ef1b1b628b6aa6d1eb789 WHIRLPOOL 11f2aa7a5a67bc822216cb3694623d5d6121dd9fc48d78e4837c56af589a73b8b43c2b01b8be2e799993e0af8e57972503d4e404f9242dcca1582ca7b17cbba2
-DIST oslo.db-1.7.2.tar.gz 134542 SHA256 e10b1bc9b128aaeae652809e1659ec2d2f64e2d1a143b9c9c66eb9cfef66c02c SHA512 341289a7bdbf61382bbeab101b41e889ebea7297986fb765d0fbeeec027d47d78d249f8b1df3ff6fed77f3c457e75fca249826dbbe5a7417ae3b6da7f766dc5c WHIRLPOOL 7b29b0d6088ca666af931f90d0ec1b1cea9340066a9a90756f179cbd1944cd6e70d07b709718c6df2db50a7f14561004f4fd5411677484d20bd96764b06fb823
-DIST oslo.db-1.8.0.tar.gz 143208 SHA256 0688ced3c34c975e2a68139e0f91601ef43c79fb73308d75674fdc40d30a2d4c SHA512 c97fd671572dc1fdc2bff642e5680f1b8910c737d295ff8d79bed6e4886de46216361de47c1e7f0ac88315988b7d1cd448d6cffff58d906524d8f9ec86d2e582 WHIRLPOOL 70d72ac5f0baf1c01eea040908a2b35336f793b3c7968f218e83a2c1699fd7381ca84cabef9a612069020a1292c3e195047a5795ca6fd9c62b961c68393b3f38
-DIST oslo.db-1.9.0.tar.gz 143040 SHA256 028ed6a38c1ed6d39d04f3dc2d7b7e2e0aca3cf53e72e145c3c07a5a0fb80eb8 SHA512 2131b2641502007b9b42aecbcb7e83a0cc90527edda2df91d52507dc58f0418b0111c9fb22e9d8bcf40ed53588adc9f02bec1b3df5788d99c775c328c1b3118b WHIRLPOOL f6205bb8e06efaf549d433c236069a5f0432cf49d1c64aadab0617f7badf4b6ea1a7277e42da1f62428c81d33f802adbb8895daf3cbbf9bd0e3e95f475a6bc80
-DIST oslo.db-2.6.0.tar.gz 133772 SHA256 07fbfc19ce8f84de47819a66dcd86c2ce95c7203a4de68924165ffc367ef22ee SHA512 1371e56ed65923e3e624d6551e18c9623b8b3f6adbfcfa08591a6e3771432d4d9e88bd0bcd57ea76ffeb7bb49a476ed1a4b8a01969a2c0d3d317865f26a5ab45 WHIRLPOOL 50975dc63c339dcc0344fd897f4e5e2f655f9bfc7db642fd4a4871be760abecddc6bcb5ff4bf4c06500697069ed5a090e52e90107e90cbcd8ffbb07a7cfcf08a
-DIST oslo.db-4.7.0.tar.gz 141288 SHA256 d8110193efaed5fa13b22171dfc7c1bf4aae4fcd7f1bc95186279d4598a56f49 SHA512 efe699fa32feb65f84b08d97980e9ea87262782ca818546eabd683aef5b75e6c4770bb49d1c433b2ccfc6a31da76e565494dc56949e81d1e815a69dc9d148ccf WHIRLPOOL 462dfa6baa68c741d9c9b1d753d4037b9dc23b66a40e3630af1eb581624234401dc1456774b4c9ff84d2e5567398e50240241404e3a86eecbefde47abea86031
 DIST oslo.db-4.7.1.tar.gz 140778 SHA256 a39e091e4d06c757dd6249f121e2ae1babef595f451f7ff56110c0be718d0d8c SHA512 0df3a715ee7742ff51bcc2c291cff3076de33cb57e47fbe23ffc0649a85130a6f6a27928a1452b4087b3bacec9e8cc35e0a69fb012df494e7254b6ad7b349b59 WHIRLPOOL 4bb8751107705e46e164d47306e814d9864074e61e23220313bc5d9099d42a81545b352d960731b579eac69f02e3674cb032baafed8715e974ae2eeb59b354a7
diff --git a/dev-python/oslo-db/oslo-db-1.0.2.ebuild b/dev-python/oslo-db/oslo-db-1.0.2.ebuild
deleted file mode 100644
index 07f3281e5283..000000000000
--- a/dev-python/oslo-db/oslo-db-1.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-0.3.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.4.1.ebuild b/dev-python/oslo-db/oslo-db-1.4.1.ebuild
deleted file mode 100644
index a61c4cff8ccc..000000000000
--- a/dev-python/oslo-db/oslo-db-1.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.7.1.ebuild b/dev-python/oslo-db/oslo-db-1.7.1.ebuild
deleted file mode 100644
index 328c9df5a1d2..000000000000
--- a/dev-python/oslo-db/oslo-db-1.7.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.7.2.ebuild b/dev-python/oslo-db/oslo-db-1.7.2.ebuild
deleted file mode 100644
index 986c164950bb..000000000000
--- a/dev-python/oslo-db/oslo-db-1.7.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.8.0.ebuild b/dev-python/oslo-db/oslo-db-1.8.0.ebuild
deleted file mode 100644
index 299bb59b3b97..000000000000
--- a/dev-python/oslo-db/oslo-db-1.8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.9.0.ebuild b/dev-python/oslo-db/oslo-db-1.9.0.ebuild
deleted file mode 100644
index 299bb59b3b97..000000000000
--- a/dev-python/oslo-db/oslo-db-1.9.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-2.6.0.ebuild b/dev-python/oslo-db/oslo-db-2.6.0.ebuild
deleted file mode 100644
index f993a9580ef4..000000000000
--- a/dev-python/oslo-db/oslo-db-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-4.7.0.ebuild b/dev-python/oslo-db/oslo-db-4.7.0.ebuild
deleted file mode 100644
index 552f3ad92462..000000000000
--- a/dev-python/oslo-db/oslo-db-4.7.0.ebuild
+++ /dev/null
@@ -1,56 +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_3 python3_4 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-4.7.1.ebuild b/dev-python/oslo-db/oslo-db-4.7.1.ebuild
index 343dc6c826be..e9729cf1b20e 100644
--- a/dev-python/oslo-db/oslo-db-4.7.1.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.7.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.db-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 50f875e3e80a..c6aa0c4ac039 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,7 +1,2 @@
-DIST oslo-i18n-2.7.0.tar.gz 36899 SHA256 9f510fd251510ca670ef876783a1727f67fe7a27595d772057273d33e4664f86 SHA512 c0733c63aa64046cf693676d43bece82a75f962e260d1e46f76120ada0139459184016c81a9a760d71493e414c0eb06311c9b89cc713d11c022a7faca4d46ab6 WHIRLPOOL dfb922bbf520d2a1e1691d865a0c133d0633572ede58c0ba28e51df08e5f9ad70ff40e31722b1612778ad0f96ec231978579f493b2db7b433ebbcee1d234f68c
 DIST oslo-i18n-3.5.0.tar.gz 36093 SHA256 5fff5f6ceabed9d09b18d83e049864c29eff038efbbe67e03fe68c49cc189f10 SHA512 156b28fa1db65a57a8db2744d72cb5db2706ec773746e676895121c0d6459f4806d826b76428841ee7124c27eba281095fa50d64cbb68f82133c41560ea15950 WHIRLPOOL 8d599b0e989c650d305c0f2ad85596971e6b0e3c5a8f8daa00ba76b9fdc8cdf5486a346343123247efc8dbaf4d7825a62b5340a957c7e7881c2483ea051e90e1
-DIST oslo.i18n-1.3.1.tar.gz 35050 SHA256 8e1b9b3f87cea9e43a2414bb02d8c79b0a688c916afa1f1453f6a0a65ffd85f6 SHA512 987beef5e59b213988001fb53f1b2e41b122b830bd476c64a4481f7650db45d31d66c94d79da26e1fc346035393c00a63febb1254d3ab881ce3d2b00398c5ac8 WHIRLPOOL 7b590d93c478d855edfdfba8a31dac491913426100c8e216cfd4b82ff47b60f98b34a56ff69e2af49d0c16d3e2ac1813731527ab21bb4f9fe2f33dc5847d0835
 DIST oslo.i18n-1.4.0.tar.gz 36140 SHA256 a3d64e8d2b4235a457da2c6269d8c97e867a90ba7d938fe0ed3cfc792c8c87bb SHA512 df1491bb4d98b9295c08f4b7dc18cfff2758834ff5edb9aa3bdc064e587ab475e7e060dc5212c5db1e7e2f34cc4177e5c713a4ac6908a9750f50dc6316105682 WHIRLPOOL 8e77849c0a8f3c5a7e5b314f756673f31a3464f2a65c35e8ad506fd0ce10430b2fea0fae97eaccfef258b74a24db2f86b0843575d25f3d3a84a3b19ae0c5ff12
-DIST oslo.i18n-1.5.0.tar.gz 36068 SHA256 cd09da0780e45737b784bdc026ea705ad006e3c003aa5dfeab83f269b4ea0e70 SHA512 20a640950b7e0eef69371eece396fc6b284c87e195b98a98ec689f207f9ab4f8a41c70cac1c64b0f68621742b6e9da8001d422f67242a3e03e6b4cf09d8add96 WHIRLPOOL ce22737d5285abe18a7e62d01894da59f7d1068a0d16dd055ba62d40888bba7d1408f3d739bfa6a5da7f7149fc84f3794067db4562538f7cee99fca3871924ac
-DIST oslo.i18n-1.6.0.tar.gz 36136 SHA256 29be916f3f4c79cca76d57e604a187b3020354a2ca89d486647b79d8a9adbb9e SHA512 c3a338ce0e5f7fb22f193aa749b4d2402f394af6b010cbb8dddbe2ec259cf39ff8a31d1730da4517ec24208b1bf439af48b97bfdb34acfecd78876bb3f6f4ec1 WHIRLPOOL 50274047e4ee12dc4c823f23e3dd9c7459f381d7882339e8de4b743a67ae433e9a062b1042fc4304c9b9dd9544744a76d3139265f0d1cef8320e91cd7af2fc06
-DIST oslo.i18n-2.6.0.tar.gz 36063 SHA256 b5fae03ebac2083180ecd5c7d651bea5c66924dbe2d6c90e1d835ad364dc7688 SHA512 fc6c4d68fff1a540e7b23ea684d6ff45712d04f7c53e4f4d701bc05e15b18a1548735a32a016cd39b2080cb6053850debbdddc00b4294e6799727e1737e0520f WHIRLPOOL de0f3e57c774f6406f952e3c395f16809dfa60edf86f20139d6dd8e1843ebc08f7bb844bc75f5dad5f62518aa054e4a79e7327f086d31494f41c314e0894bd61
diff --git a/dev-python/oslo-i18n/oslo-i18n-1.3.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.3.1.ebuild
deleted file mode 100644
index dcb5a611b7ca..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-1.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-i18n/oslo-i18n-1.5.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.5.0.ebuild
deleted file mode 100644
index a7c32d50f67e..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-1.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild
deleted file mode 100644
index 8a81e4e09969..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild
deleted file mode 100644
index c86d53669037..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild
deleted file mode 100644
index 16de121e2eb7..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-CDEPEND=">dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]"
-CRDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CRDEPEND}
-	test? (
-		${CDEPEND}
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${CDEPEND}
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CRDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 9154cf02f029..347390dd94d8 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1 @@
-DIST oslo.log-0.3.0.tar.gz 33955 SHA256 c32f85824f2634ffbb34fc7bc1dfebdc706b404ff787d97df98ccc508b311e59 SHA512 d50ead9274e29a9fa3d03f7cfa4de51601b4e2d3c28ccf1ded3a389d7485e5d858c418a5eafbedaec164f4d47ff40e066b0a3f6e11530f270a9d0a4a93d20556 WHIRLPOOL 6d1177899b4771660685a34ce7f91835803c27533bb8d60a047db889e243fac9e49f91ab691244beb0dbdc226bb6b0186e5d3e845e68e96005d4b574aeed01ba
-DIST oslo.log-1.0.0.tar.gz 34366 SHA256 3d66e9a70b82bc1c7c0b70114d093620e86bef679177ee1ec668c6e0a1acf52a SHA512 420a019592778e69cf339617d21b2eabde8220709f9067bbfe61ce11b8defc54f6635b8f120557b032bea15eac936ad4957e23f9f041556390c9e0b641ca0c0f WHIRLPOOL b579fe52acba0ca5957a55b6720862ef7343d0f41157e667f7bd63e57c6779af683cbaf083440c98a1cf0184cc162eb91b64a52a1a19c1e9732a7eb4ce8530c7
-DIST oslo.log-1.1.0.tar.gz 40991 SHA256 a568d567a99443b617338e4a9f120d3c866896b99e5aad2eff1bcfa448ea7e28 SHA512 761324c6a48e6c43411c44a741c7c8e38bdc0ad08e1eeadaf4efd3b264e00c428042b873bc294a0176bc0831d7a612d08e49da838611ad66e2954a7547cc42a0 WHIRLPOOL f680ce7722818bb3d1f2e682bce447ae37fd16a1ba066ac264c5c7ae1b29803c3c12e33138d6b66afcc5e222a401526f1b1eb07f294974551eef0184e83e575d
-DIST oslo.log-1.10.0.tar.gz 42768 SHA256 9f2addc788f8b316a76cd2655e5524ad962b125cd62187896f0b8c2563d75aee SHA512 4a3ec2b439c469d61934250a1a9c74a6afaf62a4ed8e7cf119a9ab1a49f120a03aa1df06e351b8e2445ef487f2a9e2f29f5c8bb2892d408ff61d26352b8e0274 WHIRLPOOL 4a9dd6f52526cee3a5cd486a4bb7a60bd70ebc382e86ffec204d5574e3c7620713ff745a20f84ba8d33c5a438589bd11038e5ff602fc79ddd9c5c44bf24d2fad
 DIST oslo.log-3.3.0.tar.gz 56039 SHA256 b3414b6f3b05f50571d8973543227f0d6445c297ba762262adfc28b704f8efd9 SHA512 77258a5861db25f46d1148a55990f9b708563837e5dbb2123db1074a837ffbe88b4fe3e788b23fbf2af3aa9ef1a0204d1ce3ef37215bd8265e0559f3d780f882 WHIRLPOOL 2ad46f549514b3cc098b65d3ecc7e73ccad078b3652398cc98ac32302b0ef62cf8c26b057c827cea12ac38bb38ee15c419f5e19f33d17dc18754d0e0c3100a8b
diff --git a/dev-python/oslo-log/oslo-log-0.3.0.ebuild b/dev-python/oslo-log/oslo-log-0.3.0.ebuild
deleted file mode 100644
index 6d3a7f23584f..000000000000
--- a/dev-python/oslo-log/oslo-log-0.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library provides standardized configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-1.0.0.ebuild b/dev-python/oslo-log/oslo-log-1.0.0.ebuild
deleted file mode 100644
index 168b262a4a19..000000000000
--- a/dev-python/oslo-log/oslo-log-1.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library provides standardized configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-1.1.0.ebuild b/dev-python/oslo-log/oslo-log-1.1.0.ebuild
deleted file mode 100644
index 5b65cc61edda..000000000000
--- a/dev-python/oslo-log/oslo-log-1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library provides standardized configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-1.10.0.ebuild b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
deleted file mode 100644
index 79510e5104ed..000000000000
--- a/dev-python/oslo-log/oslo-log-1.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/oslo.log-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index db630ff6a9a6..514b89f755a2 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,10 +1 @@
-DIST oslo.messaging-1.10.0.tar.gz 216864 SHA256 d7044bf66bf65848778a10955ac3ee9d7c5174c9b07687c2e36a624417e91d06 SHA512 e2a6e06248a52ddab4cf1fd02510e8d900b39002944df191776289290efac3455a78751caed018b5755158a643b31d9beaa825f0af5147caaf1571e5dbad2a50 WHIRLPOOL 61baa991eaabe168a2b2383913b74be545ac009010d0297dbac2ebb5165b2cae8c00226bf3539071a00c79d5d2db510d64c1accb9b64d03631e8b8b485818294
-DIST oslo.messaging-1.4.1.tar.gz 144160 SHA256 28243db5fb84287016d6f58fa485a71496c825bcfca3ae806035017700a11945 SHA512 e5099bafa81f0dd86459034cf8a11031fb84b1af3b1fa7820e526f45241f37e8b2eea1a11b7aa420e38b36b3d7fbc2116ceeffe6cf635af9c36cc4ef8bb3b76a WHIRLPOOL 5732bcc2857448e996743914dc1e43b56fe13c6d5715b40967177dfbe0718b6e9d166e5a90fb394ae210150487bca2e3977335971ee9bf2780003ee790cb81d3
-DIST oslo.messaging-1.5.1.tar.gz 146353 SHA256 b1bac4fe771b089e839ae6b071a441f18468a5ac7c506a506d93875dce200250 SHA512 657633df4900321dccf0ede8d1e047d628c9451c9f33d5a4f61cd4bf1e476d1212b7b05351afab8e1020555ef69e567446e26970a2593c97cceaf2153259f640 WHIRLPOOL b869843f1f9e03054466b3324887922b011868b9b520231f7299d0496bc3d7decdea9b12f437c2bc2f8b1883231c7c5af269a86662c5e40740aecc7ce463050c
-DIST oslo.messaging-1.7.0.tar.gz 201952 SHA256 dd18921a9bcdc8d34c64410bb684dcd852a7a320e6be4992b0c93a7dc02b12f8 SHA512 1531d19a585609091f490138044b5c543ef26c34811e0268245a4710d945d61bdb77cc5729cd7b3f4477e2d78c1feda3801c614e8994c9d3f2638e93af73c7f7 WHIRLPOOL f53580b6b955ffccae0e7f80e39e11895e4cc7a2e22755c0183bfc5a6c13af42ebebd71c8137a6be767f66f83d6de20510bb46e67f02de6f9dc1717a82c80687
-DIST oslo.messaging-1.8.0.tar.gz 201858 SHA256 afff6d8367e6723a64dcb518d709d4ed0f91e15960360051d2498fc34e4ddda2 SHA512 5a2f79350f0763af52df984a43464bc12126e1520e4761c2c055b011f6063604e9aac4273732f45b1056a6af7aff120d005140ee89b2a9e5118f347c0918ad0d WHIRLPOOL 1343e4b6d691756240b252fbae90301bfde08b64ed7a0fade0d8b1662913ab55d1e844dade8215dbad68c4fab64e50005b1691b68aa35772d4ece862fe3bb9e7
-DIST oslo.messaging-1.8.2.tar.gz 208688 SHA256 31222c9afe3b5655401424a6229f633bebf20cfe5027e69d2e12f7e954556f1a SHA512 a8940635fb1d08871675730d2eb841af74896963d1f9624fec6ecff03e99f280091f342abba683aa9a5eac209009e75618f637571e34c5ef76fd8617f4ffe525 WHIRLPOOL 0fa2f5531178763ff607b062b8741ba02d396e868cc41a4e668e2ec26ef119f12dfa4261da418ec314c915e36e90f2cbd8da88f1bf559460fa0e442cd4a9b0f1
-DIST oslo.messaging-1.8.3.tar.gz 208757 SHA256 149d325431e2c4415edd5bdaec0cff4e9109c02e8f428382610cfa1a238692ea SHA512 98fd93a4ae366ac413ec0ad0310b669d9e0dddf61a03b2da40bfdfb3aec63de95a187556bcdecc19a209c38398f2ed0359aa05c9024bbad429e4c79c35b91b01 WHIRLPOOL 22f2a4237f874f3a681d3ea6e87bea7ed9759f967dfe8abfa8c6dc0f68d362b248f54b98fb7e64ff388de7c406f0cde29861fd17fe2fef5a8a688855b67c436c
-DIST oslo.messaging-1.9.0.tar.gz 214963 SHA256 ac5f58378515597e6d5759653cac3828eb2ee6bb11e2bbf94ee0d65a692990ed SHA512 2e7de860fed55b0548f3cfa4a911cba0750889fd807ed7addb83192dd37f84997ceecd92faf480be97873e58286748865c8c57a09014ae0de97c60be826cd27f WHIRLPOOL 8e331116313757c93b2add853a35929e0a0603b691f9ffb322f4e39c422e13d83ee757277e42ce9b0360cf9e5823bb066a48fadc8eb706f7ebca018b014e1e06
-DIST oslo.messaging-2.4.0.tar.gz 181234 SHA256 6e505e86ebd2115992d41db2ab4e2e2b946d2a2699ef205f84d74f1a62c710bf SHA512 2d3b8dd220307d97fcf5e06269771d2c8b1412ed69e08258f4e77791a9b43077e787b8f21248c8282e53630d57c461034d93aa91d8d129ffe5e6d9abe871a72f WHIRLPOOL 99c023e230505b06a75ae51f63d67de60fadf4f44851a6a50466dd865b6a3f9b39c949ce31c36fdd35917281700b316edac6301d2d6d64b2440fc22ad61e1681
 DIST oslo.messaging-4.6.1.tar.gz 220648 SHA256 be0499c3c2bf22f7ab3934bd2c331af6eea47f8c6508774d209a8028e9582421 SHA512 b63a3e6d68261852a09a238a404459e6f0e23b60bab863702aa044bf2256244d86bdaf86a7eda8f13a73d87d7599ffcee4a8e7ea2df230ff7a7e3f84b8279d6e WHIRLPOOL c7d9b341eb243f382db2e39b90f4b430dd75b0445322fe228e26201ae75b06fec42c27f80a1f003dbb7c03382be94b1ccca3ed96b3bfd4f14c723c496db77a5f
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild
deleted file mode 100644
index bef7b6d33633..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.4.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.4.1.ebuild
deleted file mode 100644
index ea0b2f1e87c8..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.5.1.ebuild
deleted file mode 100644
index 52afa0cdcc16..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.5.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.15.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.1.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.7.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.7.0.ebuild
deleted file mode 100644
index 1a8e147514a4..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.7.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.8.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.8.0.ebuild
deleted file mode 100644
index afacc9f6726f..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.8.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.8.2.ebuild
deleted file mode 100644
index 660f9bf92665..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.8.3.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.8.3.ebuild
deleted file mode 100644
index 222256f0d4d8..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.8.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.9.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.9.0.ebuild
deleted file mode 100644
index 8be57bd51ef0..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.9.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0
-	<dev-python/oslo-context-0.3.0
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
deleted file mode 100644
index 3c5b2849ca8d..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[$(python_gen_usedep 'python2*')]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-2.4.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-middleware-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index cfe6aea1004d..1d2f55e799a7 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,8 +1 @@
-DIST oslo.middleware-0.4.0.tar.gz 21486 SHA256 d300f8342b5faaf712890d58da111789740aebb4b46874e41b45110b704719cb SHA512 6001ecdf42b0a2cf99c51bd43492e5d8dded2e41669e25a866808407d7762c90cdb8da2a8f5070c64df1ca81b5dedeac8dd012d2576c14fb201d236e73ed2188 WHIRLPOOL d431f55b50a6eccb29c9c4e061c8424d57a818007cec77792eb1ca2ea38c2309186f4ed5949558a60a1e385ac1a7dfb7b03940de129e3fc3f3421722b51f7503
-DIST oslo.middleware-0.5.0.tar.gz 23161 SHA256 c2d2a78debef27181d69e4f2e887cb2e4617f32ad4681a26c0d67210151bddf0 SHA512 a92c1e3bc82fdacf8028170e32600d48e4da0c422a1290ee4dde5fd848b367cc4c8906b7db1f1116d6a3a81a1d4e5d896f3bd3a89c121e58f2a108b532debe4a WHIRLPOOL 3d108f06e30273fbb99450be52512b548a152a7cd75143ff7a015b929506ed7070f4cf6b216b80d5b4c6a07724e9d72cfebaa4ae459f29d3516ebc7bc846c05e
-DIST oslo.middleware-1.0.0.tar.gz 23209 SHA256 5ccf160ae5ce23f3f59b86535352e3b5a9fa35dab0edc4ede8b17438da559995 SHA512 d1658c4608a1ba8f6501d9c576263560e2c77c24d6653081c17115f96011f298b0d203b1511830b4842efc08303b0d7452e6608f3e848145c25e9b960d11613c WHIRLPOOL 0a6c71290c2bbf5d8eca5c7264cd97f981e650139695f08a7fc6e320508cea9bdbb1d4c6d5b01f7cf702d11d5e21712477f73aa2fe2f62e17aa2c731022417d8
-DIST oslo.middleware-1.1.0.tar.gz 29957 SHA256 0647456ebf1611e2a0efc445673af3583780b0ccf694f61a8830d54fb5d6f63c SHA512 ae497098fe4edccf79ce93de1bd42967081616a81f7be8ec255a8732021943e8f377a6b57f6cc23c992506a5bed2641299d2653fcce6f6619d2ca1eff318cf71 WHIRLPOOL 410e422ea3b36e843e2ee91d64c23d84ffd86819bfca7e226fda3f1c2a6d11c9e8a8a4e7d5696764ce276a0b9984becf9361967861c17676b4fd9d77894baf82
-DIST oslo.middleware-1.2.0.tar.gz 29850 SHA256 0597ae9df233ba58e3f58e03878ba1f1d34a30918895bb109ebe50d8760495b7 SHA512 021836c40d096d96effc904a1ddd4889dde7f40e598aa435be3e8b5a0ff5dce013515bae878bf4eb05680fe01737c9fa20701de46bad151e7b795b229309e9db WHIRLPOOL 627b3c968e806cb1256768286ea580aa2ff4edd37107e3873db52030224cddda19ae2a4b341616f6a103dc4c456260d5c02f6645be4bf805758587eb54fece68
-DIST oslo.middleware-1.3.0.tar.gz 29172 SHA256 9e0fcf28f5d635c10e684bce26524e79a9da78a5c3d380c6759d2f419a0ff1c5 SHA512 39f3ba43aac0839aa47112eb6406286ae5e9ff92c53b46540e456d885617ad583a5a1ec3d86bdd1f95be9bb31354b3dba061da1fe28e6174ce01adc75901e6c7 WHIRLPOOL 05d57f094c22cddae6982cd3cc45cbf2fb881b181eceb39fc7295e9f930425180d4c2e72ce0ee700c979dffd0f40bc65d4d83eaada424553cc047cb7a8123db3
-DIST oslo.middleware-2.8.0.tar.gz 35432 SHA256 ec4c4da59abaa441814d85610f911df4be405a98f9c4af0482dc2fa03f3d2bac SHA512 73c3d18a2d97a3a06436e31124a73c6196f874a3b99ca3e698bc73426461ab4402545e53eb12fa048030508f32d523c47978723b51d30490529686b7e119087f WHIRLPOOL 419a21db7c26b31ec40fc7b28ba9b1fff600c3169e069184968af05a3631779f1e79e0159ce30752aee91f049b68b96add647d6d0988a70d0cd59776722f2538
 DIST oslo.middleware-3.8.0.tar.gz 39756 SHA256 2d985b238182cf70c1adbe1a041eb96eacde3106751fe2c7f1cd81d57a4dbda2 SHA512 575708b9f19938787d4d42accfbafcd63a9cee0aeb871dc0b3dd504dc4d5f97db27abfcfd7ae56dfc7d68eb670c11f93c1f79d3fd02d30247497614b3f51d80a WHIRLPOOL 2498c2a67ca83214c8512a2a86d78155638a107971d7a98a3534c625138c89f56273ab6dda437399799a6960129f4c7dfa758d2af46ede15813d7614d5db3a6d
diff --git a/dev-python/oslo-middleware/oslo-middleware-0.4.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-0.4.0.ebuild
deleted file mode 100644
index 9ac1ec6c3e05..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-0.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-0.5.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-0.5.0.ebuild
deleted file mode 100644
index a692c4f007cd..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.0.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.0.0.ebuild
deleted file mode 100644
index d7d813393aef..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild
deleted file mode 100644
index 6df908b15467..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.2.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.2.0.ebuild
deleted file mode 100644
index 96f95ba10e87..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.3.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.3.0.ebuild
deleted file mode 100644
index 1d182ae78756..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-		<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
deleted file mode 100644
index 790ac3132795..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 4093311fc0e5..d900f0070313 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,4 +1 @@
-DIST oslo.policy-0.11.0.tar.gz 34280 SHA256 7aa50cea4db9e26e2cb94f4fa5b42889ad3af70af74fa08bbc15b2c82190c220 SHA512 68593d5d05640d9b505532d03ba8dbf16b121b3d31cdc601ff86abdbfa7e8e2dcbd8a398692ae09496735a7a833a5913e5543cc0a99734b4f40f8b8f0de53f00 WHIRLPOOL ed2ccda20c63173cbb80f009f835348db99819e3371ed7ef3617479e084cc3b8cc1affa39f98dc83aac7237d9d8a506d81a778726a4be2cdfc60cf2e428514cc
-DIST oslo.policy-0.12.0.tar.gz 35104 SHA256 5a2319e99a5e6bff310c74222f26a1425e9554c9bf577dcb13ee3cee8c545719 SHA512 b1228d60feb91f8a787915dee46f8944a1c831009b1433ecffc7256f3e1c17efd842d17b69e723b2ff303a05e7a8099f3c9ab1f2fce73a7fd1a5ea552a454c9a WHIRLPOOL 32dcc70a6a4ccd2f9d7ef8742376e40b0bfdb58c15414ca70c46a96d464d62e92a0822f424de0cb615c81ecd07e7e6473203deca7c5c1ddef1151fbec87b5f07
-DIST oslo.policy-0.3.2.tar.gz 31745 SHA256 e69a5c559f95bcbf91eb0ea9f16aa65f0fe5fccc7fa03693d4cc991b76e969a6 SHA512 55043f7cbb93799dc53735844d8a315bbdfdba6c83121612737e6125f78e9396f071b2ff6d67133b582228e7e3a36912a4ab02aaa6641ce62f8820a1500bdd99 WHIRLPOOL a93e99f46db150e14327f5a6109dec56993a78c28ef93daa630418685da4d60d1017d8d805ae856eccf8e7553983dec7cc4b87005f12b965a9b4d75348e288e7
 DIST oslo.policy-1.6.0.tar.gz 38076 SHA256 24d5ecdf4e10f33a9fb2e8784876f73276637d8663c33f594e8efc99e179016a SHA512 468fcad020c90ce55b8f12199952f946cef6f352f3abc72b64e4538a6bd98dbf1d7ebe191600cff0e2654f97e4af3ccfc480a88c36133f33045ce37c2692a31c WHIRLPOOL b84ebb32db93710c5019dda8833129f3ccc855486655daf7b937eb3ad786b501cd51a9fdb4b55819dd414cdb3151a72b2d7ffd118c015bc1ca7b68a60c5a435d
diff --git a/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild b/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild
deleted file mode 100644
index b419486a6499..000000000000
--- a/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4)
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild b/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
deleted file mode 100644
index 4380073c05e8..000000000000
--- a/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
-		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-policy/oslo-policy-0.3.2.ebuild b/dev-python/oslo-policy/oslo-policy-0.3.2.ebuild
deleted file mode 100644
index 034d0a2d730d..000000000000
--- a/dev-python/oslo-policy/oslo-policy-0.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4)
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 4a21540804b2..9fa3cdb07ce9 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,3 +1 @@
-DIST oslo.reports-0.5.0.tar.gz 33848 SHA256 acc8a11422536fccbd1eda4af6b70c219e994ebcf357719480d82981f518672f SHA512 afc4af1255701798e6f5786194fbdb9d523aa657987a2c7e02751482570426634c353583931f83b295fdde0c8e7919f465867344236595733788f8d38831f161 WHIRLPOOL 7ec7130987b784ef72a2382108d5dcdee809fe9b8c8b12c967af18b738dc98e5c72d52c90b93bc4aaa19bba279df98c9b9b9638dc7067ae07b3a950ed12989a7
-DIST oslo.reports-0.6.0.tar.gz 42210 SHA256 c5ac22c2a611a8fad6d3a5667dc88becc69deed11d25db69b22ef8a2f4aa4748 SHA512 43223d432a62c506d1071ec5f8bce5ecd62a49de4e69b4f63b5cfa1a4ce2794735307e9bf8dddd06e3716497c39e963fe5612463ab9eaa3f3900d72c9c4f5156 WHIRLPOOL 269f5d00b833db12dfc6b07f5bb8fba35f385edb25ece7a4d7eca587ad9a91157fe80efc6dedaa893b902640d9cea4295c9eab5a2fcdba42f31cd9ec4e2dfa03
 DIST oslo.reports-1.7.0.tar.gz 41592 SHA256 288e9a3b699fcefcb9ae8d848a965e5c6918729b4200ae0e799b077a8e8ecafa SHA512 be40ade6d4d67eb7766bf7f1609809c92817363c8788ff6a8c069d6de650eef57e4ea243a03eab2e855866966c1e95999235363066f9a84faad25f9bc4c9b138 WHIRLPOOL 2422a76258f73a33efa92bcc016a4cefd9dee40459cd1185a9f6140fb13bc91618025a0da928b629d05cd734e239558847c41e64676543a0ef92f7d0e8c808de
diff --git a/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild b/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild
deleted file mode 100644
index 09454e0186e9..000000000000
--- a/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="generified reports for openstack"
-HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
-S="${WORKDIR}/oslo.reports-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild b/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
deleted file mode 100644
index 11ea4eec0d6c..000000000000
--- a/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="generified reports for openstack"
-HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
-S="${WORKDIR}/oslo.reports-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index 6e5ef7df4f47..8e7e8ab9d3a2 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,6 +1 @@
-DIST oslo.rootwrap-1.2.0.tar.gz 21838 SHA256 95dcb20ebeb5a178fa25e7815d3a17e0cbd92c5eaf0b6e9e677c1eadd2c5fc22 SHA512 868a0ca97049ca2d750b7d52401a1e87efcfefb170e8dea4768b2e75e60f01d797181421c93e1aa1166d44e5ef8abceecc69c267a249706cf8ba05bb5c21f872 WHIRLPOOL 34a0728d6e93fd27c474a9234f73ddc6d0e2762917222ea5b847251f8ae52329a02de4e29987cb9a867596cb8a43b34a80d20f9bc391090785d785863eec11f5
-DIST oslo.rootwrap-1.3.0.tar.gz 37576 SHA256 42081a30779be0a8e33ee53f4e1235c17080278c4285505a6b65243740aab629 SHA512 256b2da73818ff7b7c02a0fbfaa90f9c93877e1f5f1ec15b2f68af6c90169fde639bb6334d2eae352cbd80a3006f6de472843bf7e499d96eb056b6d57077ca56 WHIRLPOOL 4b05d567bc2ce63f6da9f144de91246ab9d6857b388f75bbb80fc529339eda1be4b485c057249e4a67fdd5702f2474fb2010f8b4155053cd607ce18df4f64533
-DIST oslo.rootwrap-1.6.0.tar.gz 48419 SHA256 5fe6d1619a5306f9181899c7cc5251ba5a0de0d3c60f85b2172a2f7d400a4962 SHA512 89f6615f87e9d45e7810157a07df3f8ceeab5f7b6826bc16256294eb9c6031cf6c5c698d92816f31e160d1f5bb98b7564cbf54079b0370ec47b9dbe83c3c2b0f WHIRLPOOL 4109b2e393b41c70e7e94f9f71674b6ea8dc6ae369cfe094f31a3372d049355f690f5bcf2a90804b5f1a0d02560d798471b855c39fcea3b5a577b1f86fba8f10
-DIST oslo.rootwrap-2.3.0.tar.gz 41367 SHA256 2ce6483fee2955f2462b529682a7afb95c6bd745038f69ff408bde9004b83a87 SHA512 6add1d88e13100f11a5e8faee76a1a42f1113dad55dd530bd923714d53beeb7007f8e37c24a12debb9db3fa81fad8b8d363ac463535b367134e93e753c9ef2a7 WHIRLPOOL b3eb54a7a0be5d59825f4d019849dc75e8d94659f47965c921d6d85215a882f79bdd3785f9f7bcab35878219053705428e5c68c64dc78d1b9a5bdf11f027672c
-DIST oslo.rootwrap-2.4.0.tar.gz 35568 SHA256 a5ad4ab3379e29db324db93fbfa405501978c7ac582d18cb31fcc7e92bcd219c SHA512 e9ebce080fad9a5c862602ab78108c4f22bc9988dce2a774614f8223b430a0fdc3a50573eac468dbf3c1a2d178dd372c51e3e30aa3a0ed3a799b6253676eb6e1 WHIRLPOOL 95652554eaf4d5b94d9cc949ed435e81819985b42a8a1016f3d43bbb46406353c0fb8f642a7e7bf8b483f7b211a5480d54660fc2d44753417e66e5b0af3d2e6e
 DIST oslo.rootwrap-4.1.0.tar.gz 35590 SHA256 083b6255228982484fc483db845a49e07f474cfc12ba1ba70490f56880027989 SHA512 ef06507989d168bed8d3943d69c53318b87a2de6f403b9563d79ca75b9e17da887ce68775c54cc0fb8488e99ae3dccb08f8c3e4cf2d46882b699625519a46705 WHIRLPOOL 638a8cbf3cf463067ddc26934b914d4bf50b7b6ce51ba48a83df7abcad62836a1bdb0f660120a04facf4d1cfec589bb690a7039486884cbf3013e1ab622f9dd1
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-1.2.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-1.2.0.ebuild
deleted file mode 100644
index e4c9c81c8d0f..000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
-S="${WORKDIR}/oslo.rootwrap-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-1.3.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-1.3.0.ebuild
deleted file mode 100644
index 10647f92a098..000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-1.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
-S="${WORKDIR}/oslo.rootwrap-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild
deleted file mode 100644
index 3f3c734f1f73..000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.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=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
-S="${WORKDIR}/oslo.rootwrap-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild
deleted file mode 100644
index 4bfbd1a64efe..000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
-S="${WORKDIR}/oslo.rootwrap-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
deleted file mode 100644
index 4272b5884a91..000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
-S="${WORKDIR}/oslo.rootwrap-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 864c976dc651..e23be6903ce7 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1 @@
 DIST oslo-serialization-1.11.0.tar.gz 20612 SHA256 b9a5b8bd4583957476464016f1c4d3ca01a30a0125acb1cd0ddd830715c88e1f SHA512 0fbe6282f26678208c22d31e6c221d63173688151b1eb228fd1dbbc184973c1039c43efa8d4f67f7f99dc3263d46021e6f0b7efcfbc4c13515d4a4d0f55cf0c2 WHIRLPOOL 3adb4c481ed8b8b789714b2d182b43cb7e948cfc49a73380c5abd3f662f00d10f8a10a41596f31c5a3ec98e75bbd170692a6fc8f720875fd4fe35d1b23df8e7a
-DIST oslo.serialization-1.3.0.tar.gz 22586 SHA256 6d5b0f8a0bdb59a7818e62c4c85c4f1ea81f634f2add368b553c93a5c4f28e93 SHA512 47db8850d8f3111e5dd0ef7d506cd629ba36d0996487dfe80256557f505d66accbc83131d6066e323eec85f1b9b22776c4a351372e50ab66e059c89a61f8ad16 WHIRLPOOL b4a9889a66c96da0f43f40cf7647da4ea848ec408192170eefe9f3d8cea435eacd5d5e55e2d4701b961b6819147faed82189f3e90cc3e33b1766b014bdc3aa5b
-DIST oslo.serialization-1.4.0.tar.gz 20631 SHA256 082dca272f0a941e1cdca1dc02849c5ddac65fa7d19604096be54cd41e7b4317 SHA512 d6f1428dbceecdad7e0bff8895a8312f00613f17f93b9a9ed66ff4c00e803331b2b19c547ebe3e13eccdd08dce82babd5753c8ede873705bff1cc70cafc1bfd9 WHIRLPOOL 5fe72f5e5ee85d828482bcef066ee86950cc69b1b7850c3340d60b18d2cc3b5221f63e5ef449a081f57c4f31c0f15864610847f072e529da6d832be67d3439de
-DIST oslo.serialization-1.5.0.tar.gz 24068 SHA256 3ca368c96777cb54a656b6429914717d17f05a7bda13ce6065c0930dce0d4f78 SHA512 5d5f7bce43b5ac3b2c7f12a53fb78340bc0a1eb7454426f43f2e9e45c913425a58e7828cd89bcf7b1b7ba58e1e50fe09097fb9b836872a89eb85676baa40b7a8 WHIRLPOOL 68553208d25e0c8f617258ef9c8eafb3d7b331794b26659963c170474435f7456cf4e7fe33134407965cb0f5b490a48655b08a7154bb76988327dbe344cc2c87
-DIST oslo.serialization-1.9.0.tar.gz 19474 SHA256 2cb1110d083331cd764f514138c770323e005da987614720f5c1e852c2eb0a03 SHA512 f9b17d4aaee5f2434022d2f8770fc891ccd589881a3ea1b6fc017e13cadfc311ddac5f845bf863cf5cc46792ff2baf3590a0ad817a8a456503d76c4741993298 WHIRLPOOL 0d1189d41783eeaf796a25c761bc83f9582d63d9e286715895685048a63cedb4ba773db0d3b0afb613a07847d7ef6c9dc0ae6951e3789b93727fbd1fa2cf006a
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.3.0-r1.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.3.0-r1.ebuild
deleted file mode 100644
index 95cf01c96535..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
deleted file mode 100644
index e110bba05c58..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.4.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.4.0.ebuild
deleted file mode 100644
index b271274f5441..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild
deleted file mode 100644
index e3ecfd8bdb7f..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild
deleted file mode 100644
index 7745695dd9c4..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index d883a5d739d7..4f78ca6907fb 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,2 +1 @@
-DIST oslo.service-0.9.0.tar.gz 57558 SHA256 f77753910391a1b2bd7fd9b5b863d7230b1ff727443dd2efcb725ce937ffb566 SHA512 6e17d1e28682732c8866e43f509a7fd7f69d2718493de3dab939600207e56fd0622036ff62928b9855b6219729e1173e62e1a1c949959a5d2d58eeeded97a1e2 WHIRLPOOL be645ac0d461056d5df4d17bbfe6f3819d6eba4fd2764459d287badf056d5c962e2c690b64fceba72160094ca1d29ff5f6c7708fef90bd192faa8ba532a4d4bb
 DIST oslo.service-1.8.0.tar.gz 66072 SHA256 cfd519945adb986f3e9e9bb01bebe1a0875ba38b1463a7deb6a7cba5a4e02d4d SHA512 f84aae9eddd4a702b289a2265bc4d53f4d0f01ebeba3c48b2614942eff6beeb3da7a978dcfccc58c9ddcc28031f358da3875926e8baece9d96bf5829a1c3b9e5 WHIRLPOOL 3da0853cb7568fbfde61e9a08cf2bbeaf741011e4768774c5e1423093adca8028861bcedf0b1451fce4c5154af17932a2944c07412d6fac3262653c8a11f4392
diff --git a/dev-python/oslo-service/oslo-service-0.9.0.ebuild b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
deleted file mode 100644
index 25e7c7f2793d..000000000000
--- a/dev-python/oslo-service/oslo-service-0.9.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index 14325dad08e9..73cc71887f56 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1 @@
-DIST oslosphinx-2.2.0.tar.gz 21094 SHA256 a0f650b9c79c333a4fbd51ebeab7c6f5f957c400c13f5b89a936afbc16de8874 SHA512 d8efc5c1852dd195ff5a13847674093915eb1fcaed94bd46ec50667888b851786f362340182e507cbecabbb4155ed456af4f4611c689db67738613c409bc0473 WHIRLPOOL 5e48bcac16123041f6ca9d5e2eaca329af10729a995ff8ad1db6bd01acf926891a4162515940a7984a6cca872fc80c9063ab721ccf76991eec91888f3b8d60b6
-DIST oslosphinx-2.5.0.tar.gz 26445 SHA256 d0452adbfee87d70ccddc270173362efc14c423cad3b27f96409932613051a7d SHA512 91ea48d70ff3f850f4c7ada54500f150b40f63bed2476312dc5aab3714533c906171fa88a564bc541f9c1103242dd7e96809e564fef21d6f8a529770b387159a WHIRLPOOL a58e5f7e3d391c2e91e21dd86fbafb30e7b15af7bea07994a7aa5f02da85bf44575b7b3047c34a435968d4dbfd6e70b0806f5a63943262453665380d11b44886
 DIST oslosphinx-3.0.0.tar.gz 25644 SHA256 d39129be6b6076e087ab9a108c1b17f67cbb233ffc2481528df3d76b612cc1f6 SHA512 f2b5f35124bac9bf661ba45af1f18703725d5b5432cc708689a548bde6918975722729f321fb4c1fc8a146011c7e86c1c6abfdc746806d4bf7fa7d640e057a0c WHIRLPOOL 8ccc00a71a3d5f67a33a989120ad2591977169b93a5d81fd2c7798a6b93ad33ce45e6ebd2be69c7e0b0e4fa2e79719e393e63f9a250b50e7b5b9d4621bf03e94
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild
deleted file mode 100644
index b29a64f0238a..000000000000
--- a/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/}"
-
-DESCRIPTION="OpenStack Sphinx Extensions"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86"
-IUSE=""
-
-# NOTE: dev-python/hacking is unecessary as there are no tests
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-"
-RDEPEND=""
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild
deleted file mode 100644
index f0391516ec80..000000000000
--- a/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/}"
-
-DESCRIPTION="OpenStack Sphinx Extensions"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
-IUSE=""
-
-# NOTE: dev-python/hacking is unecessary as there are no tests
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index a3c248d23a6a..0d117de19794 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,8 +1 @@
-DIST oslo-utils-2.4.0.tar.gz 56342 SHA256 fe210740eca9ef168afbb98038b94e48e3beb17f48b8a771f044a5fbfc7d0397 SHA512 6fa0b065f905c09c02748b76ef1818789fb96773beb1ac5d2bebb8edf76794e411961fd259e4ecda754ec0b8ebd3d8e323ac6ac3f971c4bf2d6755e2ca2ab64e WHIRLPOOL 888057b8720fc91b3b6ac85d8c6db88b2998d0cec1b495da7aaf10d2cd2cba0e482dd667479d5bf21d2414fc26e9373afd9d4fa8d433d9734d6a33fd789ae4c3
 DIST oslo-utils-3.8.0.tar.gz 70830 SHA256 c0e935b86e72facc02264271ed09dd9c5879d52452d7a1b4a116a6c7d05077aa SHA512 bd2e140f8f2c06c3b1ad8ee34071746e3987352d0ab79d91ea70716c34b4a8baa066e9731376618554b57b1b88ea570ab2f51c563c43f78a46ff7a132ed03fc5 WHIRLPOOL 865a2d438f0085c7cf50f2c29d12dcbb9f94dc1a5d7679d69a56f821029ef8f92d4f19dfa4375b302dd3848f77e35f7a168cefbd9e85bac26a680cfe3cfce9f1
-DIST oslo.utils-1.0.0.tar.gz 32719 SHA256 4d1fdb896eb7a690ddf2a04b47c347caefaf1117bb2be83723546fbaa5141864 SHA512 09c6b759f39eb90ec382f68f3cf70e600847bdc6c44802a82e279a10be75587fe5e67f5e5b136ab6ac338b69ff484a869dbf236e0e46fc72a90ca69619a53c9b WHIRLPOOL 470720887a248afc953c691ba8e659fb010b3b59708992a34387814487b3077f723879f603d931d1a14efd87fe95f868103ca7beaa8bb78c97a9510c28e8364c
-DIST oslo.utils-1.1.0.tar.gz 40359 SHA256 f12dfba246ff52e94ec005d5c5862c0300e6cd295ceb953b37b876571a544dc1 SHA512 6b6ffc086e88c0222e9931c78680f15f021b9e9bb211bcb9b4114cc62f47b5bf85846b58e7b792355c7bfe1c01dddcb78871f981fde719360c3889daa85a5ddc WHIRLPOOL f44c34acdecd1d4bd495c60e65d41cebdaa7ef1a39fc4a749a339161ec428e3d274462e34fa8729aa2e7bcdc1f0de66e8d3f87c022c6c91425f1778ca7bef145
-DIST oslo.utils-1.2.1.tar.gz 54946 SHA256 9cd8bcde345554582fd12c6daab81a7327a90c72861aa644e8b7b3fbfed5deba SHA512 f928afe21ef908cb6f20beb42502c4709827fdcc7e44f81fd5adeb4ac8faf07649c813824702e0a1972e8100ec894f441017dfc3a887f1b56afd4bfa24846803 WHIRLPOOL c91b4e2eb283b46df6341d7f52ca61ee20b286c84afd8ca8a287627a7d3be914b343c9fd1ea141e02f2c7179c96921ab38c6d094666ba3979dc639fa5fb2e4f7
-DIST oslo.utils-1.3.0.tar.gz 57677 SHA256 1586065ba1cb4e5dbd731fd612d52945af815b9e3e1404209d8c955b87909b84 SHA512 cd8855ab3fc7123b6410c52142a82fbce0813defe77ca6e7434bd2d4f678c8c477a045aa6abd9fde8915874e45f058094f017a6150f4e07917db44b545788f01 WHIRLPOOL 1cecace92c179f7db2c382d0e6cbf53cb7a2ec8f38d4108f87b78de7ae4204d044af8d3cd5e5a75facda0d71b3933f5339d0bc5f9ff2869696173862cdf309f6
-DIST oslo.utils-1.4.0.tar.gz 61352 SHA256 f90e1d52542225031bc7e3d9bdc1b1270a80388e30285532124586e45e9317f6 SHA512 43cb855a9f05986db34f6aec845d0c4d6eb4c2e5fdb10b7f348786a6e28122eb6f476bb09af76bb406a985e4fae3f0b94eb5f1bbfd5b41fa5853cbb2d94b3a24 WHIRLPOOL f7f282199641a22f23fd3214b73ca1c52a7f241ebd4b67c1f1ba8505b62a42d70c7ed6a665357fb017de8ac1e8d7267f0f367bf88786dc97b23b0a9669328372
-DIST oslo.utils-1.5.0.tar.gz 67945 SHA256 797c048eb266abd7cf2e872b460e466453cc593efa524675e40b5abd3cdcaba6 SHA512 c9a582ef45223eab01ef49a8c248345cfccf57edb9d7d257c71f0f6014fdc95e6d47ecc84905b380dd1a4869636cdcf84f5f5648741a01323a37e16d818f3f14 WHIRLPOOL fb15d70b4b81faddd61d1d32f07e41a8e65052c407f3dfddb1d77a7f44150ba5da99327e28edad3f8eb65a6140f30bd83d6b68646ad2bf10985ba870c1d2442a
diff --git a/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild
deleted file mode 100644
index aff843668476..000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-DISTUTILS_IN_SOURCE_BUILD=TRUE
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due to the use of namespace packcages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-1.1.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.1.0.ebuild
deleted file mode 100644
index f77c52b69f7f..000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.1.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-1.2.1.ebuild b/dev-python/oslo-utils/oslo-utils-1.2.1.ebuild
deleted file mode 100644
index d296ce578a7e..000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.2.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
deleted file mode 100644
index ec97e17280c9..000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-1.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.4.0.ebuild
deleted file mode 100644
index 188c50a5cce9..000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.4.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild
deleted file mode 100644
index de10241e7ed0..000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
deleted file mode 100644
index 7e85ff3667ca..000000000000
--- a/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index c6ec62eedccf..aaf58e349854 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,3 +1 @@
-DIST oslo.versionedobjects-0.10.0.tar.gz 124396 SHA256 4207562d99965ec703d753e38878cc536e27930f09a6accfcc36ea2715db273d SHA512 82fd38c02facb55ab2d0cb028ca6fd9bbd8413f5a3dd671bf7086d6522c148b01c500bf3d01fed90ed8e61df33074327d9b5ef1a923187fa7020d7906c11c8fe WHIRLPOOL fbad489e2d7e8f4a3a7cbd35a8bbdf8b94e8664cd2bbb7e31f21798a8700794f2eb5d8393b0ea19e7d659b04e2cb56a799969ccfa851e2137ed6e6f2755b2dde
-DIST oslo.versionedobjects-0.11.0.tar.gz 126752 SHA256 c703c4a8c4cdadb80734021d172cb8e757a20010bc6be2152165a8e3be58acb5 SHA512 957610eae70ee35a40a5dc98ddf6f83740e0cabf142be2ac69c457ad98f9a8f28f8e41dfae08b7b1ec0e2777dccfba664b5e4c5d795feae94654a35f3d5c9ab3 WHIRLPOOL a0d0e7cad5ae3c585b55fcbe2aa497b7461ef37a83481913161265424132dddccf7beacb4255a8bd46095a795488a8db4b76b74358021b2c6238a66d674bc300
 DIST oslo.versionedobjects-1.8.0.tar.gz 132949 SHA256 e727d969a5a89190783bcfa10d2c0d0bfd68d2344be3eb2f1a61ff6f63d6fd59 SHA512 913cf8bfda0dcd24941e4aefff3ec76ace0e4699fc538eee38417f547374484d4916f64fee1c77425ea60d479c732da919077c243d51b51320b2bbfcd3e40422 WHIRLPOOL 9dfaec3590ee729a8be65e6cec98b9d6af5db16de1d615a4932636dab7969b57407b1f68a372c38835ff76c30e4ec0e01214b18edda7c1accc40b5c5cb82b53a
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild
deleted file mode 100644
index 8df969bbf586..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
deleted file mode 100644
index 70817dc788f3..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 87a1437bbf7d..6ff2d9315e21 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,3 +1 @@
-DIST oslo.vmware-0.11.2.tar.gz 102933 SHA256 036cf0ad6ab0d4defd743678999851d570c2ca1ff34eba916920ce54d9a5d348 SHA512 632635adcc09749d0fe8bd204e1b06374e9790cec4d53cbaa06b2afa6745460cd417d60df26cb1e287d6e9de98eaa09788c6797993a06d8649b765a9298d0f39 WHIRLPOOL dd77312f307e5f65a969bae52e52dbab175e4a25f627d3ccf35435ac64c551093b8b67b707388d46175d93f344e2731ebdfa2ba6062ac3b562a00877cc98b880
-DIST oslo.vmware-1.21.0.tar.gz 83619 SHA256 afea2361aa1447efd2bc10d34636beadb718ecb4698d06fc3776ede498bff86a SHA512 2ca607de95d33ec175e09fa07438db8844c10da5929f2fa8d35ef8d63f628508f9c2de62e11ebc496e89c76d93c533413a973ab8b29219431d72770e19dd2d04 WHIRLPOOL 14fc58a01e94468b4eacd78d2d47fff623525edf5a9035957392b4ae5b1179798b3d6c667e87c266d698c861971eee2f24b2b2530ce9b8fc0ccbf2ad59f6c6aa
 DIST oslo.vmware-2.5.0.tar.gz 81830 SHA256 cb1685acf7cb11be4cb72412c078d7b21350c4d34fd36e9a57361a4a51df018c SHA512 f5cc084e235fa48931744a30f6d8e1c42a95bf34b97a9adeeb79d29939b8feb76994de96e8e78b323436fd43846be5a0d2d1b140472ecfe99d33e77a2e28261a WHIRLPOOL f57db75ddb55c5a012dce85dbe86f03308e4f8ea577d9ad7937b7c3ab2f9e57ea6712de4d540480da1b8038ca3242383421d1c13300093fedfd8c4caf6cd62cc
diff --git a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild
deleted file mode 100644
index 27e11249ebfc..000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.vmware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-"
-python_prepare() {
-	sed -i '/suds-jurko/d' requirements-py3.txt || die
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
deleted file mode 100644
index 847dabdf9bb8..000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.vmware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-"
-python_prepare() {
-	sed -i '/^suds-jurko/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 0de7a8e3e463..4458c5ba15c4 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,7 +1,2 @@
-DIST oslotest-1.10.0.tar.gz 26092 SHA256 da198416f07df43a1b5c9e02bf05b3f1b7057dd81264b2815bbdfcd610f17650 SHA512 34b017b5adc56578b8893b3858b00c7c59bf6d915cc89e3db00c60cb92ae83af88cfee350c9fc14e477d34b3534d3ea1c08254bd0851e7e99f7e19cca2a85f09 WHIRLPOOL 2a17a69bc4f5148b1b386f664b9f3f5d78a1faba36916c418cf1fdc8397963da715530c9203e66ab541d3cce70e89901f264a26d612298b111f75ade116eca8a
 DIST oslotest-1.12.0.tar.gz 26452 SHA256 c6180413e92379ba4ebe010393580da28baa9ea8206d5f56adbc055e3d14299e SHA512 ee24864d3fa9563580423249b48ec6dc4fb1c559a52b621bc8324a5ffe47152caf8ca4dc21f6b767f3868dc5782b56cb8480d859452629d37c2b5005bb4d3790 WHIRLPOOL 412709c36880610155e497eaf84d8bb499850de2ac45cd170bb3e6f53ae03f0b3a60af40fdd6959636e4807ff1e996bb93ceb8d488d5e6f2ab762374369ca90d
-DIST oslotest-1.3.0.tar.gz 18084 SHA256 7c29dcf2289b4de8b3a64764ae617626e86bda948746aced80c49452df9e038a SHA512 f2db5ba6eedebc5937cbee94aa18e3b5ea9933d833ceb1e3906a18d7bc2bc9b423c7608ecad4ab4f8e9099a57ace1b610259a8b1dd7e8ad7f1d60a46ba717bcb WHIRLPOOL 2a4bd1e55ef379a0c7fd413a79af35e208ec3ff90b90fcc84bf36bb2e1a17bc3954545d81e32de4adf410872832b763e470dc3c99ce1893cea5dc1339df9d4ae
-DIST oslotest-1.5.0.tar.gz 20622 SHA256 df732f8bd4b6b5d6869e4b570624c4a0ee3f906bee9b4cd70e8933b0dcef5586 SHA512 9e4f335d8eaa9b4c22f127b43ae5a96cf036ea0238b557a549a2b3b465e5f06e7b4c58a72e752e6d1be40a9dc6cee6c331bca4635679eb80c0a36d858c195ae4 WHIRLPOOL 552cd5c5e96634d39fd334619807645eb8258879c1048771b64c618bca3497a1c9449b5b51111a86c7b231e9721a4982b6679fbbb22bf08d546fdbe219814498
-DIST oslotest-1.5.1.tar.gz 20723 SHA256 8123fb3471d82b141614728e66beecedecdd33c2844d1ef0c14c89b833339981 SHA512 b69770d260060bfec4185a3d1484d304be0e48c4dfa6ab2613eb3a73fd046eb3b0ad90ed061d8c6cca65bd3e76d7fdbe8832a73ea6674e5c9aa92d7a3978322f WHIRLPOOL 777c6c8a93502e795b3c61ddab62d8b3dffdaed62b65f73b6c63180721a00b4a64fef48a631919ef75c3c2b7e42237d71be78548ef62198113e27ffead4c1ef9
-DIST oslotest-1.6.0.tar.gz 21226 SHA256 cb65b53b753375b669dcdb4717c362a205d19e3d16ca26310c0916cfd359354c SHA512 e7eb97dfde919b523c302d7dc495d835791c646b98ce579a6056e2412b93c1791d6d7e2c8333d142b89f1e7a414f1d5c61a321b41d8ad0ba4592227f9e3073a7 WHIRLPOOL 3b8f984f9adccf9abfdd70f5b593a16a0061bac0705c3331d0065a1ad6bc4a97b402e7f4e757a22f01e203980865510bf7741baffc9ede77ad1f652e15b6dfb1
 DIST oslotest-2.4.0.tar.gz 26392 SHA256 cad9a20b4c26a691e947b826c37ea393c35384ff3d9091ac83c8ad4201795b0d SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886 WHIRLPOOL e8a5b8dc30bf2aa68e58c07d3a9e2067aa8d037022d22bdc9351950d70f922b61ec7e907652ae04886cd918bccf84ec4f409dc0604cb2a34af87780f1912fba2
diff --git a/dev-python/oslotest/oslotest-1.10.0.ebuild b/dev-python/oslotest/oslotest-1.10.0.ebuild
deleted file mode 100644
index 4e04566a0743..000000000000
--- a/dev-python/oslotest/oslotest-1.10.0.ebuild
+++ /dev/null
@@ -1,67 +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_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-"
-
-python_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	else
-		esetup.py build_sphinx -b man
-	fi
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/build/man/oslotest.1
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslotest/oslotest-1.3.0.ebuild b/dev-python/oslotest/oslotest-1.3.0.ebuild
deleted file mode 100644
index 31caf8acb008..000000000000
--- a/dev-python/oslotest/oslotest-1.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-1.5.0.ebuild b/dev-python/oslotest/oslotest-1.5.0.ebuild
deleted file mode 100644
index 98d82ab06aed..000000000000
--- a/dev-python/oslotest/oslotest-1.5.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-1.5.1.ebuild b/dev-python/oslotest/oslotest-1.5.1.ebuild
deleted file mode 100644
index 44c548dd0817..000000000000
--- a/dev-python/oslotest/oslotest-1.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-1.6.0.ebuild b/dev-python/oslotest/oslotest-1.6.0.ebuild
deleted file mode 100644
index 54cf71575854..000000000000
--- a/dev-python/oslotest/oslotest-1.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-2.4.0.ebuild b/dev-python/oslotest/oslotest-2.4.0.ebuild
index f04938d5300e..13f3b9350f8d 100644
--- a/dev-python/oslotest/oslotest-2.4.0.ebuild
+++ b/dev-python/oslotest/oslotest-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch b/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch
new file mode 100644
index 000000000000..54cfa59cb801
--- /dev/null
+++ b/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch
@@ -0,0 +1,40 @@
+From 8f7ce32dc6bd466f1ea6ccc9260917016061bb4e Mon Sep 17 00:00:00 2001
+From: David King <dking@redhat.com>
+Date: Tue, 15 Dec 2015 08:52:26 +0000
+Subject: [PATCH] Adapt bundled parse for Python 3.5
+
+As the upstream pull request:
+
+https://github.com/r1chardj0n3s/parse/pull/34
+---
+ tests/test_parse_type_parse.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_parse_type_parse.py b/tests/test_parse_type_parse.py
+index 4151d37..cab6143 100644
+--- a/tests/test_parse_type_parse.py
++++ b/tests/test_parse_type_parse.py
+@@ -11,6 +11,7 @@
+ 
+ import unittest
+ from datetime import datetime, time
++import re
+ # XXX-ADAPT:
+ # ORIG: import parse
+ from parse_type import parse
+@@ -611,8 +612,13 @@ def test_mixed_type_variant(self):
+         self.assertEqual(r.fixed[21], 'spam')
+ 
+     def test_too_many_fields(self):
+-        p = parse.compile('{:ti}' * 15)
+-        self.assertRaises(parse.TooManyFields, p.parse, '')
++        # Python 3.5 removed the limit of 100 named groups in a regular expression,
++        # so only test for the exception if the limit exists.
++        try:
++            re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101)))
++        except AssertionError:
++            p = parse.compile('{:ti}' * 15)
++            self.assertRaises(parse.TooManyFields, p.parse, '')
+ 
+ 
+ class TestSearch(unittest.TestCase):
diff --git a/dev-python/parse-type/parse-type-0.3.4-r1.ebuild b/dev-python/parse-type/parse-type-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..228e991cb9e9
--- /dev/null
+++ b/dev-python/parse-type/parse-type-0.3.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simplifies to build parse types based on the parse module"
+HOMEPAGE="https://github.com/jenisys/parse_type"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/parse-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'python3_3')"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-python-3.5-tests-compat.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/parse/Manifest b/dev-python/parse/Manifest
index c1a0bb1dca4e..6e0b1576f728 100644
--- a/dev-python/parse/Manifest
+++ b/dev-python/parse/Manifest
@@ -1 +1,2 @@
 DIST parse-1.6.4.tar.gz 24025 SHA256 a7cccad221632f1e2553d585b428b20d362738311e6f58933ef46b4389c16054 SHA512 2848e3331f1b2604bb5f1a8a0084ff0b7e0f12b2d3832395461f4b76729637783250d18a134048106ffa6768794f38fc51534dbe5a88db303f0426530587dcee WHIRLPOOL 2c3b91ec933ac206aaf2c2201b3108bb291a448f458d79aa2e6db5cdee676e05c200f1bf60f3f9810161e126c7ae4633efe498276fb2d1b270b10ebc4ca2047c
+DIST parse-1.6.6.tar.gz 24638 SHA256 71435aaac494e08cec76de646de2aab8392c114e56fe3f81c565ecc7eb886178 SHA512 fae467b6f6e35f04d9e501162117423506701d101b2265e941b5b34420e833a0f4dbc44f62c33d51836a62ef51da9b5b8a3a1d39b3ec490f9eb77c5b6f302cdf WHIRLPOOL c206590ebea8f6b2ef552b0911b83c692a50b0dc395ac76e392a2b4eb16e8c544411da7b7475956183de3d189e6cc27b87752c0aa991dc5e7587e854eea6953c
diff --git a/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch b/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch
new file mode 100644
index 000000000000..5183cf5ef32e
--- /dev/null
+++ b/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch
@@ -0,0 +1,50 @@
+From 32f15cfefb7c7b6476360ac65cba807aa3dfccfa Mon Sep 17 00:00:00 2001
+From: David King <dking@redhat.com>
+Date: Mon, 14 Dec 2015 09:58:19 +0000
+Subject: [PATCH] Fix test_too_many_fields with Python 3.5
+
+Python versions before 3.5 had a limit of 100 groups in regular
+expressions. This limit was removed during 3.5 development:
+
+http://bugs.python.org/issue22437
+https://hg.python.org/cpython/rev/0b85ea4bd1af
+
+The test_too_many_fields test asserts that the limit exists by
+attempting to parse a string with 15 fields, which triggers the 100
+named groups limit.
+
+Adjust the test so that if first checks to see whether the limit of 100
+named groups exists, and only assert that parsing 15 fields fails if
+that is the case.
+---
+ test_parse.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/test_parse.py b/test_parse.py
+index c524349..1d50568 100755
+--- a/test_parse.py
++++ b/test_parse.py
+@@ -6,6 +6,7 @@
+ 
+ import unittest
+ from datetime import datetime, time
++import re
+ 
+ import parse
+ 
+@@ -624,8 +625,13 @@ def test_mixed_type_variant(self):
+         self.assertEqual(r.fixed[21], 'spam')
+ 
+     def test_too_many_fields(self):
+-        p = parse.compile('{:ti}' * 15)
+-        self.assertRaises(parse.TooManyFields, p.parse, '')
++        # Python 3.5 removed the limit of 100 named groups in a regular expression,
++        # so only test for the exception if the limit exists.
++        try:
++            re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101)))
++        except AssertionError:
++            p = parse.compile('{:ti}' * 15)
++            self.assertRaises(parse.TooManyFields, p.parse, '')
+ 
+ 
+ class TestSearch(unittest.TestCase):
diff --git a/dev-python/parse/parse-1.6.6.ebuild b/dev-python/parse/parse-1.6.6.ebuild
new file mode 100644
index 000000000000..a51d0d50ebb9
--- /dev/null
+++ b/dev-python/parse/parse-1.6.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="parse() is the opposite of format()"
+HOMEPAGE="https://github.com/r1chardj0n3s/parse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}-python-3.5-tests-compat.patch" )
+
+python_test() {
+	"${PYTHON}" test_parse.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index a3d43a4983c4..27def38b0c75 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,5 +1 @@
-DIST pycadf-0.6.0.tar.gz 277434 SHA256 9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f SHA512 97e223296e5cf77bbc2f7f8b2caba70f76d418ccd476bbc07462dac2c01399f920ae7801f1e30ef91ac6dbfe340b8b45dff2426bf457c1239f54293dbadeef61 WHIRLPOOL 96644ae4b82352cd0a296f3a9adf161b8500d043d8d2bce239c23473a53e1a2feb43f60d92c67bf1543b3b101bbf722bf9104b2c6b16fa7240b94e86cc6a2aa1
-DIST pycadf-0.8.0.tar.gz 255774 SHA256 240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1 SHA512 3b8446c33f0bf740b0f2384bb9e4c5ab5d960690e50bd52cf2217eb184f9f8061dfe39da9b21ef275a7c66ba4e35b912bfd9476469b28c3c2cd6f33d912ac6f7 WHIRLPOOL bf28052eee894a1a986c1903f44f2f800f096979188a6b0ff502b7316d38ce7c43197405e635da097de038e24c1d870140a4ddd1c0eaa543841b3073055f1c19
-DIST pycadf-1.0.0.tar.gz 247178 SHA256 8278865dba0c6d7d2c83f51629c0f215393e8cbc36719c845b591f40dd80609f SHA512 7f7a4bb1d89ee3a63c9c74980995864b6e80a4e7df2111b4bafb42ba977ab2b86aac5e288d930068789cae9cabee13300ede7ae3c520440cc5fdfdac057085c0 WHIRLPOOL 68eab74a8e7a727d178dfdaa7cef27d0a41538540c450446a768775de61854eb82ca070792e694bad422ccacfae894b73226ab9224d82f742fdcd037ebd2c725
-DIST pycadf-1.1.0.tar.gz 248161 SHA256 af114ba08d535ad9600e961c1048e1c7214c669a7ee3611f46ea06b917b46953 SHA512 f3215fda9c76422ffdaa65d11c65c3835562539f61f02c91e167433c8e65a55b81290792ae827a8b4e7c497878322b802e42c666658a3cf11682e2a72002c8cf WHIRLPOOL d75adc656d344a667ff1b5d3063f300be8fe57d9e5fd32b86bfa242d132e3ee587f72aa4d1eb104c468c71005e3b9825581c145dc7c8b64b7c701274016004da
 DIST pycadf-2.2.0.tar.gz 246623 SHA256 bdb3427a28d318c6ce073b54993c2f4cc9148be498b30ad1b362ade45eb4f7fb SHA512 366e30b387ec1164aa52f1f79141263ea411313ff06f72de753f316ba1c0cd1b751633cd899383ba375747903c531976938d8c0733a25340a85d2b5d61d0425d WHIRLPOOL 6e9be54670196a35fe6f0c4a95429bb24947332e7fd8aaa9d99af9a57e9174cd60befe1d2a8a1a8e2d69debae67b1d23d6369ada543dda42e906913b9efa00a2
diff --git a/dev-python/pycadf/files/CVE-2014-4615.patch b/dev-python/pycadf/files/CVE-2014-4615.patch
deleted file mode 100644
index 54596a5c2cb3..000000000000
--- a/dev-python/pycadf/files/CVE-2014-4615.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://review.openstack.org/#/c/94878/
-Owner	gordon chung
-Project	openstack/pycadf
-Branch	master
-Topic	bug1321080
-Uploaded	May 22, 2014 10:12 PM
-Updated		May 23, 2014 3:34 AM
-Status	Merged
-	
-Commit Message:		remove token from notifier middleware
-
-notifier middleware is capturing token and sending it to MQ. this
-is not advisable so we should filter it out.
-
-Change-Id: I11d9f2f23fc3b60c945c33d4d02bd7640d88a083
-Closes-Bug: #1321080
-diff --git a/pycadf/middleware/notifier.py b/pycadf/middleware/notifier.py
-index fc921f8..621c8b4 100644
---- a/pycadf/middleware/notifier.py
-+++ b/pycadf/middleware/notifier.py
-@@ -88,7 +88,7 @@
-         include them.
-         """
-         return dict((k, v) for k, v in six.iteritems(environ)
--                    if k.isupper())
-+                    if k.isupper() and k != 'HTTP_X_AUTH_TOKEN')
- 
-     @log_and_ignore_error
-     def process_request(self, request):
diff --git a/dev-python/pycadf/pycadf-0.6.0.ebuild b/dev-python/pycadf/pycadf-0.6.0.ebuild
deleted file mode 100644
index 88289d3745f1..000000000000
--- a/dev-python/pycadf/pycadf-0.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-			~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
-		dev-python/posix_ipc[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2010h[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=()
-
-python_prepare_all() {
-	# ? typo error in conf.py
-	sed -e s':oslosphinx:oslo.sphinx:' -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-0.8.0.ebuild b/dev-python/pycadf/pycadf-0.8.0.ebuild
deleted file mode 100644
index 55962001d84a..000000000000
--- a/dev-python/pycadf/pycadf-0.8.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
-	)"
-# !=1.2.0 of sphinx deleted since it is not in portage anyway
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2013d[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-1.0.0.ebuild b/dev-python/pycadf/pycadf-1.0.0.ebuild
deleted file mode 100644
index 50dfd63d0cd1..000000000000
--- a/dev-python/pycadf/pycadf-1.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
-	)"
-# !=1.2.0 of sphinx deleted since it is not in portage anyway
-RDEPEND=">=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-1.1.0.ebuild b/dev-python/pycadf/pycadf-1.1.0.ebuild
deleted file mode 100644
index 560f539c1882..000000000000
--- a/dev-python/pycadf/pycadf-1.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-# !=1.2.0 of sphinx deleted since it is not in portage anyway
-RDEPEND="
-	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 2413ce8ac5b1..c24570be137d 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,4 @@
 DIST PyHamcrest-1.8.2.tar.gz 372308 SHA256 bd14093c561f9af8ce8271a630929f4a45be7a4e79bec53c83b876a0547d303e SHA512 ff90a6bb1e2319d25ba8c29e998796544d5840599e7d9a4a178022e6b5bcabd23d35433073152a2707d555aab3aa96c316b8db54d7ec1c0ca2ef1cdf50e4df40 WHIRLPOOL e207d109420ea3d1eb6cf14c65a3d2eb9e1dcabcc30b7917f4c95cb445a554c2fea8e5766213fd513c9323c33b58a63f0d9b102b52062ed7f61b148aeba3c770
 DIST PyHamcrest-1.8.3.tar.gz 376145 SHA256 118c48351451ec027cceed781841c19b836739e21f71a26649fe97fca0d346d5 SHA512 4e11a3ca93886c58b512b5ad77f95c2df3771476d6ca0e99eb6e20c0292819a5f985b7004b3523c756255e503cfe4e266fdb776b285e430a7bd987164f9df14a WHIRLPOOL 4210a503b5eb1f60e7f6757d21b0887f96cfe8b5f261d490f5589d3bbd0e099b91d1dd0264025e3730c94b78419cc8e762e66ded8e33dba3b37dc3764beba4ea
 DIST PyHamcrest-1.8.5.tar.gz 376456 SHA256 db990f17477bb0e78f726e8b04fe3ac78f697011e5c8ecb0928567db14efca55 SHA512 7841f704fdad8653bad923dc243431b4c3d82a9646d1138528356162bd556bc5d16178fbc6b1f27918e8ac1df6c54afb4d5eb8b3286536df33dd85ace475ea2d WHIRLPOOL 721fd1101a32b44bfd1cc8e8fc5e63a776ce5c5b3e126311f7f185cee092ebe6035151737db1b99edeca0e9d395a4eb1c1811a83aaed015be4dc6ce2499609f3
+DIST PyHamcrest-1.9.0.tar.gz 376623 SHA256 8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0 WHIRLPOOL 2fcd5a30131c7bdf87fe79640d2eee9b4c773be9a25fd79fc8b82d8915d5cd00c6c574b02224e8a2b83cf1590d69884d15c5d300e053b8edcf9468fbe03861a5
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
new file mode 100644
index 000000000000..0e087fe27290
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RESTRICT="test"
+# the pypi tarball is missing the tests
+# and the 1.9.0 tag is missing in GitHub
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+	"${PYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index bdacbf66722a..ad400f2f5dd5 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,3 +1 @@
-DIST python-barbicanclient-3.0.1.tar.gz 38349 SHA256 d298ee0fc9e785d44148d4590ac0d9eef05d560e379e98f75a7cb35ed6bfc7c8 SHA512 354d46e85d15af1b91ed4ded55918329d843b7b9d8374bb82a9fde771ca5e71336ecd2bcde65217338f85ffcf8910abb686e0e8853cb8bd0e0022c5298f8392a WHIRLPOOL b68f792f89df005bd1c14cebb44d6b4ba4aa3d391d66daf9714c74bbadd103f40785e8c9ebb8585a64608b3ff7e47ed102284efeffb1f30d49c2a6d5c9886446
-DIST python-barbicanclient-3.0.3.tar.gz 62286 SHA256 959aca2ce3af2eed0f57e2fa9f0f9a484e40adc6b371e2c0fcc588aae9ca2b18 SHA512 0974af19781029b75e9432005fd1a50a3026531927f3718bf42b999e20877cc126a0bdd37c2de311978c132a0bfa7dbe186eb4f2cc022b8aaf2b7dc3e5c9c794 WHIRLPOOL 36635ebb89a22c898a70ce77f3dee4a88fa6969e432a63b3d554ae5d0d53cf7d5cbc29d6e63300a7acc543a9cfb0428c1ecd71c1c13994138b5c3d490f5a1d9f
 DIST python-barbicanclient-3.3.0.tar.gz 82210 SHA256 d5c68354fb5d18a6fcdcd0a0788b3f502dd6ffa57a2e47a1426cce2d63ecb6cf SHA512 9c9ea055a375cb631f081ac0dc54ff20f60e6f6c3340b0f0a92a91eed4858202d9f85e00b662a8b3b7b5183633d8f5500f6925df5a182b20046d66be48b34e37 WHIRLPOOL 94a1d91a2bb8c8aaddfe775e7a5e955eace20e75e6c75707bd56aa62a1538193161d14534c1cd9d91ece5fb57a03f0fa7e71370531c576d1f5c35a0ed113830b
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.0.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.0.1.ebuild
deleted file mode 100644
index cdda7da27b5e..000000000000
--- a/dev-python/python-barbicanclient/python-barbicanclient-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for Barbican API."
-HOMEPAGE="https://github.com/openstack/barbican"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.11.2[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild
deleted file mode 100644
index 063d5be387be..000000000000
--- a/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for Barbican API."
-HOMEPAGE="https://github.com/openstack/barbican"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-	<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-ceilometerclient/Manifest b/dev-python/python-ceilometerclient/Manifest
index aeb8f20231ab..9a29a65fb708 100644
--- a/dev-python/python-ceilometerclient/Manifest
+++ b/dev-python/python-ceilometerclient/Manifest
@@ -1,2 +1 @@
-DIST python-ceilometerclient-1.0.10.tar.gz 77469 SHA256 bbe29a6c85af3ec0bcbb7df1863bb3c3c620fa0423c67f25bd089e0ab7b33059 SHA512 23c9419ffb7610965fb0950e2c60d3f78724b23116a457c36b822c986988aee48c2b3d967f179b68769288f425c0a2ca17c25e90a41bdd487122f03ca42962dd WHIRLPOOL 798e0a0d516bf08f8be904fdba462dc2825de728a7bcca1a5e7056b035ddb992751cd9652968c5ec43dd0938b18cbbf387507b45c5f6b5c54181977609c8c54a
 DIST python-ceilometerclient-1.1.1.tar.gz 87597 SHA256 f48e2d9ecef25ab784510fa0b299d0d73aa8f41652abf9f28393a93612416a29 SHA512 ce4768e67c6a5871ec52de433292c6328d387d94860f808f63ab9102f96ba3ca2397116792a5b907d9037290a31c2780149481f1f12581e0a9dd585f4e8d0909 WHIRLPOOL 6ec0fba808036620729e984ce66ae90a9a45a4a1167ad25dc11e2da549406cfea12758e80574a7cbcb0dc56c99138918c834eb57ad486821c050a6812e425e03
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-1.0.10.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-1.0.10.ebuild
deleted file mode 100644
index cbb994b2d5c8..000000000000
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-1.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client library for Ceilometer built on the Ceilometer API"
-HOMEPAGE="https://github.com/openstack/python-ceilometerclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 ceilometerclient/tests/ || die "run over tests folder by flake8 yielded error"
-}
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild
index 36ef774a7673..e7c4f26bddf6 100644
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild
+++ b/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild
@@ -29,7 +29,6 @@ DEPEND="
 		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.2[${PYTHON_USEDEP}]
@@ -42,15 +41,11 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 0a5711b2ddc6..b99d4893220b 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,5 +1 @@
-DIST python-cinderclient-1.0.9.tar.gz 136309 SHA256 e146e370c9a6e4aa44e8f0662fd33aec532f3965bae9fd564360c279bee03f97 SHA512 102e0ffec8aab143349f51e29b1265ea564b4cb8eeb9a546e353d6a9ee1ce08f8c258776ea96975be1d55f53ebaaa1b0fc01d7b7a12cde7baf5df8142368ed43 WHIRLPOOL 2360f4efcee62286cc1e45ca28013ded25b473d9a13e6e19ac53d811c2285e0031732077fae60d83b59a6abbe637406bd5a539348168f1884739381379b44bdf
-DIST python-cinderclient-1.1.2.tar.gz 153104 SHA256 d364b627fbcbd049b2cedf125fb6aa06e2ca6213208f92b7ea393a7e1d7ecbe2 SHA512 84dc5bc89c547b05b9f305f6779ea2a47f2f964f985580d1555d0183da89c7e617433bacb11f2af23a1791a549de045e55d021bdb65f06def01062349a8cbc7e WHIRLPOOL 12082f19db2a583f9576396f20bf81f44b9769e9e9dd8e07ba54fb3cfce70a061f2e657949cf082abfd2a7f091387463e4e29065b9457d02051f27eb20cb173b
-DIST python-cinderclient-1.2.1.tar.gz 176466 SHA256 c9ccb89960b936ee261a9d6aac3895fde9b5c68e8c8e87d66ad3298a13bfd460 SHA512 ad27a7e32fc9da3c38abd5ca9f72f771229b00ab8a9f9f52c4001997afec194bda5270307ed2506747070f07e804952fef374fdb14ac75b646fb3dc6548aaea7 WHIRLPOOL afc4e2a6f5fa2917be408752f56215e5ee1c47dc6a952d5f6d294505a3c0843254136e5afd5370b9554bf6dfb97a47855e7b42122bdef0528d80a08f2feca6f6
-DIST python-cinderclient-1.3.1.tar.gz 178094 SHA256 59ae1fbeeda7a12ac8635a7cce9bdc5e8bd080707e2dc12d858857713db1d233 SHA512 01b090e782318a6971f73ca0e6b5b8056d038db3073e93fdcb81c35c876d039782361b1ab1048b0ae51dbf0fdabc3b7a3b655241b8cd46418f0aff900c33f5bf WHIRLPOOL e35fbd323ef5be8dfc9bda1863c7521319517df5b57abb2492e6b06bf7248b940f9f62107e044737ab179bb69553d6bb464718cb55e8fa773e76f0207b887710
 DIST python-cinderclient-1.6.0.tar.gz 194134 SHA256 b00b7ffc3394b7ae3f8804a10877f7c980ff65f66d7b0d4b51bf4526933951b2 SHA512 421c665be2d410f511c751687df438dc268c4d2ae5ca83d8ee2d37d3b61cd08f718851c65338e14c8cbb8304703b5f9acf98611246ca6866c5a31cc3dd86e39b WHIRLPOOL 5e3f3326ce1ccd1cb555303b0d9f5ede0cfd4c329a490f79f88ad04e2dc9d6123d294b09d393a2fd7274f5b7a3696efeabdade9b39bd93da5b7e9d421b0e0fba
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.0.9.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.0.9.ebuild
deleted file mode 100644
index 6afee41c7dce..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.0.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild
deleted file mode 100644
index 265f9139402e..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# waiting on hacking 0.8 to have py34
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-				<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-				!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i '/^argparse/d' requirements.txt || die
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild
deleted file mode 100644
index b906e7fafdce..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i '/^argparse/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.2.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.2.1.ebuild
deleted file mode 100644
index 5f29420ee3ff..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
deleted file mode 100644
index fda73cd60221..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index b5c73cea008f..6c420c20e6ef 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,2 +1,3 @@
 DIST python-evdev-0.4.3.tar.gz 27658 SHA256 011db63c94e668997ce0609e4a3cb04b92aca21304657151e6567e938de5efc6 SHA512 7bbc4339bde599f38423f88b3e5a4a4408b9214c9b622915b6f31dad50e08879d914fc83e8d95f66c158d5dd2d29e72907c4e3b0a97a3dbdfb7bde9013e161ec WHIRLPOOL 120aea7069cbe86463975103b87e7eca529df34ce14f69fe2378802f867b434a89aadfcdcab1c991ed25114bfe574452e12b33adbacadd1655e2013dc20f4dcb
 DIST python-evdev-0.4.5.tar.gz 30415 SHA256 70852905a4d0ad541ee0b8c58c566160df5bd08c69c778cbb9ebacfc50a6be61 SHA512 9d2c09c6dddd96bf6c5c639babe8a2c7dc81023de46ffcfe8e4d76126072fb380d3e726a3db1ae8025d4c816218f981ff23df86e20e0dc90c4ee4ca97ac57db5 WHIRLPOOL b548ad9cee8277bf192c30332ca0b0eeee98f90fe77db86ecdf0106948e5c2aba86ae9c950611357c3e41b9ec9e16a96525546d762c4ecf1d05f660d7107eb57
+DIST python-evdev-0.6.1.tar.gz 79415 SHA256 02a77b56596d9a34342eb5f384c736d1e2df0299ebed6d9d4fe46549b9262df0 SHA512 39d3c68352786f5da130addb4d78889987d94b8a0b5ee141e9c9452b0ce3b097884d6ec6832a67d58e0d40290f61ab8dc56cb34cd15de6a9d3da58bab6c1f536 WHIRLPOOL 4b4c6bf35fbe6c2a08695053c432deab928567db97b90f6a9ab95f0704013b48ee71280a0ff6ca76673877a5cd29354eb2b322902aea97b42a3300bb33003ab6
diff --git a/dev-python/python-evdev/python-evdev-0.6.1.ebuild b/dev-python/python-evdev/python-evdev-0.6.1.ebuild
new file mode 100644
index 000000000000..58145260ab58
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-0.6.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for evdev bindings"
+HOMEPAGE="https://python-evdev.readthedocs.org/"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 72793e3d25f4..d60f0d6d3bae 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,3 +1 @@
-DIST python-glanceclient-1.1.1.tar.gz 149875 SHA256 285f59e3e9d0ab887bb747f5c5c58c4ef87330bc99ea947ce649e3edd308a9e8 SHA512 7b2dd86014f78e5d0e2222842d4dd29da9922b0aea7a4097e88a013eee9849805170e2825426d611806edaec89c27ea055a699137faeb51e85a2cfb8d1729c0c WHIRLPOOL 80bb25c9338dc9e10065c8f8330b09e6d0f1fd85aff984d790c3b7c38fd87f8224a2d68ae6a04a6fe147641bfacff343f4e91e60cbc16dfdf4b3b9a30bbeed4e
-DIST python-glanceclient-2.0.0.tar.gz 156008 SHA256 c4e791ef80e1b60997fa612e7f6ec506969bc6247b53d66988c2829c16b3617b SHA512 c7846b86b8d02cf34cf53bba646ef93aee909fb6dfc4a6791780bfd25cd13f2d2fcf49c2cab50ae9a96c8743404386b32ec3e0127c990fbbf7d41c8319e679b2 WHIRLPOOL 07e0307d516fce7195d26b038814ff4edece5cb9497a4b8bb78c3e1a0adee8b60a5a59207574da9be82e225eec75dadc4570b275741334560d014b15171c5fb8
 DIST python-glanceclient-2.0.1.tar.gz 159091 SHA256 77e92a256679ebc76101198482ca34dd0b636f12313c4aa92132b831064b3968 SHA512 48253d70c50ad5b671e0d662612217f76e79b2e15ec1714d578c85ffae3d6b18e019f90946d11cc90e41b981c6bb24c7f47094c046892fdee33034689631af53 WHIRLPOOL 55ba594d226a9dc9bc7d007b7f3bdabed5be084f0c204b93ad604e854ed9db27f180817b8ec0510c06586bcbfc8b7998b20f7777f61ac23fd56550ef08d91abb
diff --git a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
deleted file mode 100644
index de48ad893c1a..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild
deleted file mode 100644
index 946babc4723b..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python{3_3,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.14.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index fd119ff283f2..13e7bb52be52 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,3 +1 @@
-DIST python-heatclient-0.6.0.tar.gz 109553 SHA256 fe293e11d145d86b92649063eb50d1f599dab88a327707d76a72b12022b77bbb SHA512 04b8836c212a8825b6ffb839715df881189a08e3c587762a661744bdd730d6aaf99c9e3497642011b0696692c856e12131bc8d1ff6a69cb88ae5b48aa3872b39 WHIRLPOOL 683497a0363ce636499af5866838242ef1fc2769c54d5ddf32e8dcfd5d0d2f3b648d46c0bb59c14bf1043875bf65ec99b090add1a289c9c95d383ce5ba918e3f
-DIST python-heatclient-0.7.0.tar.gz 119131 SHA256 6f58a3c759056dbcbf071e1707d6649e6d15cfc710daa1b98e9703b83a4a01c2 SHA512 5c9f12b08abaa9ff07a0dd72ceef7b205ae2afeb4d8900b2e1c3f709fc6df63f56f9d31b45acc17cfb51a1ec849bd3cd271877d9489c40d665488346531c97f0 WHIRLPOOL 0c911dca2dd48229c83ff83bcfa699d07e0ea39b3bbfff5bd3e3e7fbe62fa747ade252bb7ad320334c4bc9fd481c2c528058368d8828e56c20c0254105559035
 DIST python-heatclient-0.8.0.tar.gz 121399 SHA256 5cd1c855ee21f18bfffbc7269e40c417b953d0855aa3cc8b56d778b8612467d5 SHA512 c17d445e646c3fc2f10bb622ba2a38299182e0a7841e0dae0e7c4482bc4d8868569b2204c18dc98456507d6f5abbf64db0b8e06c21bacf360883b24bfb01efc1 WHIRLPOOL 9c0b41d01458bcb3b26be163fb1e9e557b37fafc26d9698df73cfe722f8e02b991f36731e42bb5de88f2c7c3c0d86ee7154e1da76c99755cf9b7dcea0d79718e
diff --git a/dev-python/python-heatclient/python-heatclient-0.6.0.ebuild b/dev-python/python-heatclient/python-heatclient-0.6.0.ebuild
deleted file mode 100644
index 04018403e4d9..000000000000
--- a/dev-python/python-heatclient/python-heatclient-0.6.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1313257
-	ebegin 'patching heatclient/tests/test_common_http.py'
-	sed \
-		-e '645,/def/ d' \
-		-i heatclient/tests/test_common_http.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375035
-	ebegin 'patching heatclient/tests/test_shell.py'
-	sed \
-		-e '2116,/def|@/ d' \
-		-i heatclient/tests/test_shell.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init
-	testr run || die "testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-heatclient/python-heatclient-0.7.0.ebuild b/dev-python/python-heatclient/python-heatclient-0.7.0.ebuild
deleted file mode 100644
index 12ac0613605e..000000000000
--- a/dev-python/python-heatclient/python-heatclient-0.7.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1313257
-	ebegin 'patching heatclient/tests/test_common_http.py'
-	sed \
-		-e '645,/def/ d' \
-		-i heatclient/tests/test_common_http.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375035
-	ebegin 'patching heatclient/tests/test_shell.py'
-	sed \
-		-e '2116,/def|@/ d' \
-		-i heatclient/tests/test_shell.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init
-	testr run || die "testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index b25371c57c48..0f188534ddb5 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,3 +1 @@
-DIST python-ironicclient-0.5.1.tar.gz 85524 SHA256 91dca5039ca06d6dcd74a132a261db1d85ebf6dcdfb9d7cee4efff657f6729d6 SHA512 787052c79341f44df1520c1f94a59574cb2a6dd5ecbcd23c5ced6dcec75decb310f082fdc5dc6d0ac7c86a8007fcd72ebeb0c25ca940e4e4a4eb635b661c10b8 WHIRLPOOL 4e00b4733814ce415a5dbe551f48e0367f5fd18733c3ecb171b06321c4145330949df2627b51797a2c4f8eaf094379d58e7c329bd322925c752a46394e89cc2f
-DIST python-ironicclient-0.8.1.tar.gz 88622 SHA256 db140db02f0c61f349b9cfc9aa07e01c05b8288c9bd1f844c1752e6947588aa8 SHA512 516924ff0dc4792fcc70f5733b76baa54a5e8e5a69a0d902ccce16c71ba7749b124a6892b03f45bafb2ba50a1f267c0242b00ddc4139693b230f6c380e52de39 WHIRLPOOL 83bd8977d313dbbbb6c627a6e5a25298c437d30b3e3fbef2710dff00c80a48af2b2602735c6e9aedb6517bc2d9850f0b9dc50982ee58ac7c32ac18150516c24b
 DIST python-ironicclient-0.9.0.tar.gz 95562 SHA256 8de88260f30625c6eb8c38fa3401945b510485e00189edaa18ca745b738f6a9a SHA512 324aec8ed9861ce2df4b7783b7bd8b98e30efbc8775ddcb4668f760d8916248df0d32def5cb2d30e9e743ff30e5b6717c653ca6e5cb9ea25b536a369ac45be5d WHIRLPOOL 8d992fff69724706b0a2becf84fd2312bba9be59e7b7103f39a0d5905553d9926510ae6dedd28c4f8ed51c179ddfa2cee97f78c7d2cdc59bb86b8b2fd9cb75de
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.5.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.5.1.ebuild
deleted file mode 100644
index 9022be3be0a5..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-0.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.8[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-python_test() {
-	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild
deleted file mode 100644
index dbeeabc20027..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
-		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 01b3620fe36b..e0a9174a4311 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1 @@
-DIST python-keystoneclient-1.3.1.tar.gz 338187 SHA256 8a421dbdf01251119164bf6baa0ef78b261e5dd4d3508748e47b77d7652e7e92 SHA512 d11825b717d0aeec67d4dfb0382173ee834fe3dea2097b8ff9505b86bb08a5579d6fe87509d65022d4436a3a1b4d20f2a877ece3160b53979999495b77df0f08 WHIRLPOOL 9aa0af722f56eb4d98d7efb8a35b1db95207970fba0b32496a9ae4593a16471f976efe1e9bb3690106ec0f5a76b5a744e9177cc7c03d9ffe9ed54111e3bb138c
-DIST python-keystoneclient-1.3.2.tar.gz 342434 SHA256 1b2fd5ceeefd8d75ee749acd2c3dd8805c833c89828075b814392069cd5ae1eb SHA512 4cd986c42256fbc366b81c07ab637fe81358dde530a8e9a5b3f59f4deef5d56fb1799fc82d35a3f04d3e3b810c94bfc21235e93a77c925d235322aeaa20e420c WHIRLPOOL 65b776c928126f92108c1585658a10b89e6563ff8e71f8f249fdb86e11b29811de12b17ddddb39845d66ff9533ae44d93148bd811d1e31577092c3b598348c03
-DIST python-keystoneclient-1.7.3.tar.gz 355578 SHA256 805a317c92cd8700a4733ee80f383b2187de75aeb8e9895015799628df97c68f SHA512 36682247de6c6afee2e0cdf35115b4e6adc4bafef05311337e3299f97a8608a967ca537e8aeaea2e030344a7a8a103c627ff7d118c96c75ac1d169e1bc53d1af WHIRLPOOL 91f6744ea96f8343f1e6665e6db4159fa7d48e9cbc891a8c14aa5bd2165437f9d242f3ee9c960502fda0e26ab1669abec4b32f12be1c79626fe67f6bf25c2137
-DIST python-keystoneclient-1.7.4.tar.gz 356596 SHA256 0bcf562831c4552851f1fa5562f068efd339186a746baae1786498917dc78803 SHA512 c5190e874804baa41f7a4f816eaf974dea943dfbf008a0c66893113168747ffd3910a87dc63edce7f6d4b52ceb5f6f255383a2d88d79a50f4d75d337b3421b46 WHIRLPOOL 172193536486edac34c709355e09e0a1eba9e794f483134c4fa1c33d965f26c573012bc60006dbe707f4267b4f807fade509d67ab56cde3d0285e0cf5a9e0831
 DIST python-keystoneclient-2.3.1.tar.gz 322240 SHA256 89e93551071cf29780eeafe7a61114cd36b1c2192813d3c2a58a348a6a3ac6ff SHA512 555ad57332ea677242057c34313df0d02a16f5738c584db82611db3e3636e792d30b9dc5ea371ba56a4c3b9a158ba879ca38ff5fd40ae842f8be98e52ea856d8 WHIRLPOOL 095ae83ea61f356a46fc2f8e135ffcb46db205a8bfd9b5b3acd0e7b4baacfa97d315c1b1ae3c422769e683911591d67bdbb5ec21728af91fd4eb709c0f6c3df1
diff --git a/dev-python/python-keystoneclient/files/keystoneclient-1.0.0-cve-2015-1852.patch b/dev-python/python-keystoneclient/files/keystoneclient-1.0.0-cve-2015-1852.patch
deleted file mode 100644
index 4b278dfec033..000000000000
--- a/dev-python/python-keystoneclient/files/keystoneclient-1.0.0-cve-2015-1852.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/keystoneclient/middleware/s3_token.py b/keystoneclient/middleware/s3_token.py
-index b27b9ce..4ced7a7 100644
---- a/keystoneclient/middleware/s3_token.py
-+++ b/keystoneclient/middleware/s3_token.py
-@@ -34,6 +34,7 @@ This WSGI component:
- import logging
- 
- from oslo.serialization import jsonutils
-+from oslo_utils import strutils
- import requests
- import six
- from six.moves import urllib
-@@ -116,7 +117,7 @@ class S3Token(object):
-         self.request_uri = '%s://%s:%s' % (auth_protocol, auth_host, auth_port)
- 
-         # SSL
--        insecure = conf.get('insecure', False)
-+        insecure = strutils.bool_from_string(conf.get('insecure', False))
-         cert_file = conf.get('certfile')
-         key_file = conf.get('keyfile')
- 
-diff --git a/keystoneclient/tests/test_s3_token_middleware.py b/keystoneclient/tests/test_s3_token_middleware.py
-index ab77b79..91c3e81 100644
---- a/keystoneclient/tests/test_s3_token_middleware.py
-+++ b/keystoneclient/tests/test_s3_token_middleware.py
-@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
-     @mock.patch.object(requests, 'post')
-     def test_insecure(self, MOCK_REQUEST):
-         self.middleware = (
--            s3_token.filter_factory({'insecure': True})(FakeApp()))
-+            s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
- 
-         text_return_value = jsonutils.dumps(GOOD_RESPONSE)
-         if six.PY3:
-@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
-         mock_args, mock_kwargs = MOCK_REQUEST.call_args
-         self.assertIs(mock_kwargs['verify'], False)
- 
-+    def test_insecure_option(self):
-+        # insecure is passed as a string.
-+
-+        # Some non-secure values.
-+        true_values = ['true', 'True', '1', 'yes']
-+        for val in true_values:
-+            config = {'insecure': val, 'certfile': 'false_ind'}
-+            middleware = s3_token.filter_factory(config)(FakeApp())
-+            self.assertIs(False, middleware.verify)
-+
-+        # Some "secure" values, including unexpected value.
-+        false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
-+        for val in false_values:
-+            config = {'insecure': val, 'certfile': 'false_ind'}
-+            middleware = s3_token.filter_factory(config)(FakeApp())
-+            self.assertEqual('false_ind', middleware.verify)
-+
-+        # Default is secure.
-+        config = {'certfile': 'false_ind'}
-+        middleware = s3_token.filter_factory(config)(FakeApp())
-+        self.assertIs('false_ind', middleware.verify)
-+
- 
- class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
-     def setUp(self):
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild
deleted file mode 100644
index f18e2c985ded..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		${TCDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.3.2.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.3.2.ebuild
deleted file mode 100644
index acb6632369f9..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-	<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		${TCDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
deleted file mode 100644
index 4a835e59f997..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${TCDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.4.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.4.ebuild
deleted file mode 100644
index 4a835e59f997..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${TCDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 55e2201ace3c..880344fc51d9 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,6 +1 @@
-DIST python-neutronclient-2.3.6.tar.gz 123143 SHA256 f2ae938654497e12218ca3105872a1d55c5ce06e19ed0baa8471ee024e494b1f SHA512 0d894ca7cbafe3c4f12a45e27953abdeedfeff009d96bc6852465089f64ee57f065d87067e79665a401e574100115eec8ae7bb7a220005955be4535c7a44bcb7 WHIRLPOOL d2f3aeda0894bb2f262b7761af6f64ecb80a3c15ef68fd4a6eb257446bf647e96eee5d51f692071ac776ee8c3f26ecb7314d825826070e2ddfbfcd84257e466d
-DIST python-neutronclient-2.4.0.tar.gz 137923 SHA256 4c5c3a79216c682926f75ffd8db5f4338525a643ea02de37df7bf82a1e486b28 SHA512 ce3407ec101ca0fe04da5fbb3d68e3e331824190ed6e93308e56a471b9bf1b0d873f6e7b733d205bccaba6567d87a0a829e442efb6a3b0d96ecee5a1abb5a071 WHIRLPOOL 28b798ed7605264ec6d1e69f4a98ba7eb7e825594dc0ca9d5941d5293810c4f7cd32c680d09be44077ee269f8bd0c8644543c477223d5b55f078f81a0993460f
-DIST python-neutronclient-2.6.0.tar.gz 141675 SHA256 ce72506c0720825edcb0e93b643340e044f1de9235d398fe1c45d851971020df SHA512 a14503ec5374f0edd647a4da5e75f5d6820388b73792a9c944537815e980e87890fea227b2d21e34207958350f6e08a002e6f09af5567e1b4d709e698ea040cb WHIRLPOOL 7d3e6b0baded7de81f2c010376e8b528a73715382a230ffc6790eaae58b54e9cb5765002d2a508953b22a498d5a60947decd0d2884254cb2cc12f7ae1550596f
-DIST python-neutronclient-3.0.0.tar.gz 147616 SHA256 f6dc2e514e99df4f7eaf9f983a19344a5f38adf323d71f2908c872f8eba88e2f SHA512 f985c054f614d8ec2102d5323e7320c578dd11685f34d5e3f791c0ea3efea3780731da0f777a1544250029cd6dda8484af623c1f4537b45e49386e1ae1e9820b WHIRLPOOL f3323f28c36461b2b64897bd69d9453cf0f91c6497126e3e0d539652711f653e20ca340dfcce429f5342cb9a9397ccd42783a79d1c4baabf108aed569d50b521
-DIST python-neutronclient-3.1.1.tar.gz 148206 SHA256 ac3b695f55e30e17e7f27554780adf413cb7b878be5b922712d7f8357a6dbcc5 SHA512 9b125befd971f3892388d2ded378500889525641918b53588e353503c75f4ef8005c2ece50b2df87c416b258de770b91b73b143f84a4901bdd7d804a07444b08 WHIRLPOOL 0e05430f5d1ddfb0f769624d648f2f6414b141a6d635941b1b416f98d01cbdb18a0d7643196547ae15bcf475ff1c946162ddd3c3547e2a162eef6eadb25a5926
 DIST python-neutronclient-4.1.1.tar.gz 187794 SHA256 4d5c60358272174afb019d68940f67ddad09367b2e6210e3206d19566777c293 SHA512 654a7e8d98b1b6c3fbd1a183196982ea8bb9a0a97707e7a4ddb4cde47a97e93c3356961193c305b3ab33cb8ee2273b1a941c2655e1f56a3e2a8131deaed54922 WHIRLPOOL ead87cb41f57f285a03583ca91e843a0f9c4edaefaa7020d38c949dbd56d46611f44e36c087a9684d2e87c0d236ff8124022b2afacd9b8438b6b8b6716ec9c81
diff --git a/dev-python/python-neutronclient/python-neutronclient-2.3.6.ebuild b/dev-python/python-neutronclient/python-neutronclient-2.3.6.ebuild
deleted file mode 100644
index 8e6f5853d3f8..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-2.3.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND=">=dev-python/cliff-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_:#&:' -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-2.4.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-2.4.0.ebuild
deleted file mode 100644
index 9c7100c30c87..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-2.4.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		<dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-	<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-2.6.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-2.6.0.ebuild
deleted file mode 100644
index 05247692cb2d..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-2.6.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		<dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
deleted file mode 100644
index 8989eee94760..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
+++ /dev/null
@@ -1,92 +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_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-3.1.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-3.1.1.ebuild
deleted file mode 100644
index 8d54f9cd1ae1..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-3.1.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 8b6b6fea3dbd..ce595740d12d 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,8 +1 @@
-DIST python-novaclient-2.17.0.tar.gz 230712 SHA256 af6f46890715eb5f4e0d25a714effbbac8da020715f81b1572a301c5e9887197 SHA512 6493aadab5589fb2a02c4a1440cd3f71e6918688ba634a89101c7c7b10aaa6600d8511097b07679f5927746c3463584287a0d7602a47397f169697a944b6a731 WHIRLPOOL d7523bee3ad59e40e021177cd98dff5a91136ea3ee56e2844857dced5b9af7a2bb47c5880d9fe0d35e4de9a022864c88e009b71ca762dea84eb139ff5b99cad1
-DIST python-novaclient-2.20.0.tar.gz 267956 SHA256 73fc8169d58e910340aae1ac5370c3b63a9943f748e2a20e4a1dfd7277525c86 SHA512 a1ff87b46d1520346380bf5396383d84e036892f1568d2eb201eb667837919e1cd8db3267a1ea9f6dfc616de0714374c81465de76b8a9bfec32c4742eeee3807 WHIRLPOOL 1fb3052d3fa457524c65b3de087a7cf7377d274b7a9d924529289e2e2b02992c5182cd1ec5aeef443a81c8e1d08fa1202caf6c5e12e3df40b5011f75df0837f8
-DIST python-novaclient-2.23.2.tar.gz 224170 SHA256 730cb006395b2df336bbfd75aa2f459375594726a50fe3b9126212ed487fcf98 SHA512 a207afcdb14e811980c6f3962342e3aa4da52f2e9663f94dbbac78b9d5e1e5a555d657b61948acf07cf238eaf04e32b9e440e9495adf80e19e8877e5e6510bcb WHIRLPOOL 8bd7c7f3431ec9dc78ed023e15227c5c5d40becbb9ef06d6fee65d177732af8d98154b27a39da722716ff9fffab7bc0c9790306d5ae184c4335361ac990666a4
-DIST python-novaclient-2.25.0.tar.gz 228156 SHA256 433e314223218031e7ea6e71baa54c1b13485d47fbb128ed3752e2a72ad7cb83 SHA512 b65495e94da9d42aa6eb51090ea7c2af6784e74121ea96c7021d013b8570af1df90d993df332b92274d5f92bc634149ad14616804e68e93fb4529b6b15dbb5c4 WHIRLPOOL 7401147c278a23768e18998b90842c6c17fe2c9dfb28cd320dfe0dc6ce7afd2e0481d6275deb82a4ce5c3ac826b8303390a8d80c011a242c4bed0fff2e446615
-DIST python-novaclient-2.27.0.tar.gz 242744 SHA256 d1279d5c2857cf8c56cb953639b36225bc1fec7fa30ee632940823506a7638ef SHA512 f3594f6ee1edb431881e0ccd4cb97b4e631fee5cd6ce6874514bb09079837e038c60dd1bbba2807fc10271a8b8a96304c8aedcc18e7c40811a99d97594cc1414 WHIRLPOOL e79c23ce7ae5ef20e40ed1ab3fa01d8ba2be3b85c1c19fe2fed0c2425849cb62c4ab67464d771306c630b9406127196b5820a642b3b9c7c1664d2ca229da5a47
-DIST python-novaclient-2.30.1.tar.gz 258139 SHA256 e46564255c5a66dcd1c16a0a96fca7bfdf3cb4720830599b08447e174cd7f7f4 SHA512 0deeca5c48e31063d0d8bf5e86f85869c42f4d9806a8b0420e1e419773ef4a5784c8a4295a48b83c9cd4311aea60155bd489fd916f2e290b029b83fd856ad938 WHIRLPOOL 9d8a098fefa1bf400c6d26aa9d26d12dfdf4aa56c89b4552748cefca1eaf0f90af3d19f10a1e39d11c459a4580cfdc82e2fead1401ade8634d01af18db97ce30
-DIST python-novaclient-2.30.2.tar.gz 261535 SHA256 463af33360dab3c6f8676e2005331739be12da566095e6ea69e04466c52248f6 SHA512 cc37dd11e8772bc6f060cd1fb1750b5fc98b7353059bd17b50aeb81277a54292fc96d6533a2c3008c6ed2ce08e10a84efe4ac52aca4c2585a24da29bdfd7becb WHIRLPOOL 8741aabf9df0fdb9fbdf57f2ce36de9aa8b455bc4ce1abdc0c296021013a78283c7d3b07c3cce707ae706f09d39f9aad8fbcc6b4988624a0e5a313f033e8ddaf
 DIST python-novaclient-3.3.0.tar.gz 270526 SHA256 3674e9a9e3d2d9cff4a7e625e299780195e04df52361a58d94e7db4fda88739c SHA512 218e176f105211c77e34ade6ab88012d880f836afcb60628eb470d07f36cba4f051fee92f9068e41cb07124a36d4ca4db48b96ac52edd36963489ded5e974741 WHIRLPOOL d719debd25151b19b7b308dc498faea247c51dcea3ba79f0d803be5114f888dd412ab10d49c5c34018890df7b51a7eba8c15b1c59ac831f6bf80a33a87b120e3
diff --git a/dev-python/python-novaclient/python-novaclient-2.17.0-r1.ebuild b/dev-python/python-novaclient/python-novaclient-2.17.0-r1.ebuild
deleted file mode 100644
index 7ba674032db3..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.17.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.17.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.17.0.ebuild
deleted file mode 100644
index 27b173ec6830..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.17.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND="!dev-python/rax-default-network-flags-python-novaclient-ext[${PYTHON_USEDEP}]
-		!dev-python/os-networksv2-python-novaclient-ext[${PYTHON_USEDEP}]
-		!dev-python/os-diskconfig-python-novaclient-ext[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.20.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.20.0.ebuild
deleted file mode 100644
index f6f394a8bee6..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.20.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.23.2.ebuild b/dev-python/python-novaclient/python-novaclient-2.23.2.ebuild
deleted file mode 100644
index aab64def27f4..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.23.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-			<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.25.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.25.0.ebuild
deleted file mode 100644
index 37f6aebce7fc..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.25.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-		<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.27.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.27.0.ebuild
deleted file mode 100644
index d4bc009050d9..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.27.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
deleted file mode 100644
index 5342ebe95690..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
deleted file mode 100644
index 869304ee1b29..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 18bbb1916bc8..c79c4b3a42f3 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,4 +1 @@
-DIST python-openstackclient-1.6.0.tar.gz 256666 SHA256 7400b86fc57032bfd7d4fed317ad2311bfb35ee192200c437b23c2ab85d49b24 SHA512 e62f9265566def5c43dc4fe6d4aeb7c61be802cd7f53db78bb3db681a97b140364afedff07a9e0bcc0622d39d9341150dab3ca7fa230b2c64a6c820d713acc89 WHIRLPOOL 6b7cd39f26fcd106f4e5819af8a54b4fb79e3a1dbb5aff79e7601392e25f6b7a80f94b1ff299e6d80d3afb7a064f03acfa202779f36677098f4b612dfc174d9c
-DIST python-openstackclient-1.7.1.tar.gz 265368 SHA256 c9a379d5688cf63e5ff9634929bac06204b562d2afe00fca14831ad0799e3240 SHA512 137d6bf2b6a2bd09073ca1ee63f3f6b38568baa3bc93796938e18dc694a6401353598369d8c7028d054cf31eed84bc38869375fa38649d4657b46907ba379b2c WHIRLPOOL afc99ef30eaba71059a3141eb4fe9c5f094e41cf35af12a44cf2209c3244747573651c7cbd722b750c48cc8c6897db574f3af8f1993892e953238e96d1f2f1e0
-DIST python-openstackclient-1.7.2.tar.gz 265828 SHA256 f5b25c175dc9a4fc4a6170a229b178ed5d033ff28e1f34b15af6553c4e6ba95e SHA512 8bc13d3618079aef9beeb3c7d5ca15bab3242d39f04a97844486cc2bf139e3189da21db912a5edc5e03c985374f921e46501dd211c10b2e13a2eee80a560207f WHIRLPOOL 1ceca9e37e01a0eee4d246608f2cacce9ce94b45ca4baad340ecd6b4e5132f530e61bf38723c3474615dd5973ef4b88a2492b9dee46e75a5722f40d22e2db815
 DIST python-openstackclient-2.3.0.tar.gz 329808 SHA256 5cd301fd11ed271175b2a656c0da4148332257b52d994891e61d3535870b4ca1 SHA512 efc58927c109ea227322371f6a6ef165be2878a8559f32b315b73a2d70c1f0aeb96f7dd2fa91b765ab85462a566569d412b13411aa859fef3b8ae5e73d2eceab WHIRLPOOL 92fb3d2834bbb54f16e0f7760f223e5e94e3b933ca016c7b80eb6562af25a9fe1d3428b02fe2c7e1cf413cef6a8eb1abaaae2814acd8914b1bf1f7f8793b403e
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild
deleted file mode 100644
index 087466adaf5c..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.26.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
deleted file mode 100644
index 048cb2b84acd..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.7.2.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.7.2.ebuild
deleted file mode 100644
index 766dca2531f2..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-1.7.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index fa87443d7054..39b25ffc5b8b 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,3 +1 @@
 DIST python-saharaclient-0.11.0.tar.gz 101842 SHA256 0c08bcc7d490a9133ecc261bc8b270f3a4187952b19aa375e59a460491dc40bd SHA512 de30918d23b5b8191b2e49f0f7116510533da15be412d87c9018af2e4144082e9cb127713a4aff3ac03d72867a9855d73cbd56b83db24a9bad9b7b422c451018 WHIRLPOOL 97cd3f7b90f96d010d2f267c7ae593ea9c492a4b75c048596b53f1083dd57027dd79b3f0acb3708536ce1bba2ef3ae1afe4eada22355c7c8792164652a7fbc79
-DIST python-saharaclient-0.7.0.tar.gz 72542 SHA256 7c83fb7709a870101539bd25d76225dc7a65e3848e2d698403e0a410c67fe388 SHA512 788d6a0586b00dc6d367f34ede74109d787c4cf4abd8dd2d7ef11bebe7440add42da54c3c9aaa8bdf201444d1c5fd38e5da41b327cc166b396978e85608120e9 WHIRLPOOL f5e4ab52eda75b626c8d8a722869eb9914f6a8e29ea9c6815e510e42c93f912dda8e7887fe0342faac4fdf0baf4ce727fb7fbc133281b98d2586b258a65e3799
-DIST python-saharaclient-0.9.0.tar.gz 92694 SHA256 3a268992bc7383fecbfe067b497f28c16d6577cc87646a4e88d32a954c744885 SHA512 626e99077e3d7e676be82fd0ad3e9a67d1a471dd947951a22e4402e38d5b9f4db9a35a4b7cd7f4a3bb48a2f1d0927a025115fc3f2325e64d3bc06f0839fb5c3d WHIRLPOOL 308af2a580eb27b9452413a343de3e832250a28c86fbabcf0fd320aebb2cc3aa8f750de805ea8d4757a20713c4076b7aac5996680546ea51535080120ff1173a
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
index c14fac76676f..092fb87004c3 100644
--- a/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
@@ -27,7 +27,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
 		>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-		<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
 		>=dev-python/python-novaclient-2.26.0[${PYTHON_USEDEP}]
 		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.7.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.7.0.ebuild
deleted file mode 100644
index d9976095cbc2..000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-0.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
-				dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild
deleted file mode 100644
index 8566ca7220ea..000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
-			<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
-			>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
-			>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 7eee7426cd6f..a7d7501ff85d 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,4 +1 @@
-DIST python-swiftclient-2.0.3.tar.gz 55405 SHA256 b8c0b11ff0397b2f2ba2145cd8de7b86a61d34d6f1af78fee536cb9ba5dee315 SHA512 fe52e49c67edae20cd9db65adbc3b54bd1b9b40b09e2c07c65eaae80d96266134fe55d86d7cfd919453077c6c08b06a51278f93a973ec6b4279295bd6e0f9d64 WHIRLPOOL 3b80a78c8d67254f94e58acb4d758d439e79ca0cb8633d7d12cceeed817d8c9f7297f2e9a2a82642cedc4def6b15d3ccd8bab922c3a7f230d151f414f0bbca15
-DIST python-swiftclient-2.1.0.tar.gz 62692 SHA256 e5304cc2fc58e5f9fec87c0910109b524b3634f49a6dd82a35a28cbdf1515de8 SHA512 a49b60124093df9b1fb9ea87a356aafd21ded0a7826b04786dddc94fc1d494c38c2e99d1bd43ba23579ff595c7fabd74bc29e852349852b0bbbfa0cd95f0cac2 WHIRLPOOL 9830329cd08047c943bf8cbd41a41eaecd20ef17a886f72b2504f1568969e08d8282ec4b4b23ea9368284b027ef320a615ce4614852105768fa6c7b004732f65
-DIST python-swiftclient-2.2.0.tar.gz 67374 SHA256 f41f6650150367fc2641e1536d36a68b9664db1f4cfe3e8d1de2e2b5aa41a3cb SHA512 bd60e96525a3c879e94fbb99da1d4813cb181982b753934efd32f4a8310c8ef3237a36dc8c80a78e285ace285eae7bb72b5869863f0067dec4efc713851af7fc WHIRLPOOL f0a7eb00e3d7861e79a07cb6a366aa205fdf141dcdc54519cbade576868550049c335ed9fb3f8e05cf263ac22b85f040ff7a73364a78dc4ab786c7867c7fbf87
 DIST python-swiftclient-3.0.0.tar.gz 134376 SHA256 824b8f204c5a7764de51795256e4175fdcd655ae4df85b8ae6e6ea9ec0b41f68 SHA512 4e81504876fb81bf74c3a3e034958c4783a4a9c2c426b7ae849e1968f98d9886c2299c2e67a2b366d6d4721b4635cef90ff49201ba9a4c86da9d61bfb96fa350 WHIRLPOOL d48902f331d04b3250dc6a90aa44f31d403012e10e1617a2fa52cb05b3d615293efc65a4f35872ec019254c096e44a79544d314cd1d4e6065e8e093febb3b3b7
diff --git a/dev-python/python-swiftclient/python-swiftclient-2.0.3.ebuild b/dev-python/python-swiftclient/python-swiftclient-2.0.3.ebuild
deleted file mode 100644
index 9292f0f8c6a6..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-2.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}] ) )"
-RDEPEND=">=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]"
-
-#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
-
-python_prepare() {
-	sed -i '/discover/d' "${S}/test-requirements.txt" || die "sed failed"
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2_7"
-	flake8 tests && einfo "run of tests folder by flake8 passed"
-	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-2.1.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-2.1.0.ebuild
deleted file mode 100644
index be5b65b04b95..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-2.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}] ) )"
-RDEPEND=">=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
-
-python_prepare() {
-	sed -i '/discover/d' "${S}/test-requirements.txt" || die "sed failed"
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2_7"
-	flake8 tests && einfo "run of tests folder by flake8 passed"
-	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild b/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild
deleted file mode 100644
index fc7f86dc0bd9..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}] ) )"
-RDEPEND=">=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
-
-python_prepare() {
-	sed -i '/discover/d' "${S}/test-requirements.txt" || die "sed failed"
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2_7"
-	flake8 tests && einfo "run of tests folder by flake8 passed"
-	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
index 8e185200fd5c..66a50925a759 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index 01392b9d060d..de90926dfb59 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -1,2 +1 @@
-DIST python-troveclient-1.0.5.tar.gz 97125 SHA256 f758c01ae770ec9e58b71ebc78c6e3f975a9d37d09820b512df77c827b2b921e SHA512 0912e93879cf59b41f461d59e85c421be61491cc7c58dd65a3474e479fd6b1bca016ac188938ac186bd6d005a5415c8f1cf00c88a3390d6fc8e1da4d3e0c3997 WHIRLPOOL b73db090e9b6bf5d64404cc8ec13b88a3e564a5b1a74512b95daea09190308026ac87db888d6160272eda3719e10a573104801dddbf2085cde483f64a9499d64
 DIST python-troveclient-1.3.0.tar.gz 130542 SHA256 abb0a5bf2442bd396322c65ea7b386d043e3fcffdaeed6a61d63d8be1a8452f2 SHA512 aa26b587d8e2bd15bb65ff760b89354638f6a77a4e73ec5f37ab6dc3c374d6b8c238391c09347e7fc897138fc0bdc375f69ab479f57e14f21d0882b74cc7c978 WHIRLPOOL 02490089bfea489b51e07f4da5b3ea5bbe2e839c2751c5e98ae384195465fca861a7d156e5ea179a6879d3b44c318e30f560314619705a3d8a3ac7b0f0606752
diff --git a/dev-python/python-troveclient/python-troveclient-1.0.5.ebuild b/dev-python/python-troveclient/python-troveclient-1.0.5.ebuild
deleted file mode 100644
index 1efd0e551b35..000000000000
--- a/dev-python/python-troveclient/python-troveclient-1.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Trove API, a scalable relational database service"
-HOMEPAGE="https://github.com/openstack/python-troveclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				dev-python/httplib2[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index f5b1659524a1..ac1936a243de 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,2 +1,2 @@
 DIST rebulk-0.7.2.tar.gz 254345 SHA256 ee4c75819c6d0eeedb531fb22c214e50f303ccc4703f27db1f993cd082ed5a20 SHA512 2855b6f754dd258e5e0ba8264cd6993c08fed141fb8b61f88b43beadea9acfcfeb54443c8708fa98de44f2c199dd900e6c9669dc616713dd61d873779f1df2f5 WHIRLPOOL a814772e5d34d6890b1435d652992a9b898435c4075619660351988d1ba955723a8440b8bde6a0c3e6547a465a9b040d085059a7938509a4edc9d7a21318148a
-DIST rebulk-0.7.3.tar.gz 254565 SHA256 1ee0f672be5cfeed793d294c1cfc078c254fb0966af59191e4f6a0785b3b1697 SHA512 9d1241c9ea4ce595d6bcc9ffbe7d43f91e4368d8a687b2907473be2a19a95dcd94e1a04669f753633736a3e691c7aae777af9b6ae964b487c75f763a84841a87 WHIRLPOOL 79a14cabbde87363913167a6429af2065e6ecc830a5fb680cc9c1c47f3d547b2faf25a564874015b8d6493a649536d025a80951af0c97bbf1765a489f4077d99
+DIST rebulk-0.7.4.tar.gz 255137 SHA256 1bbea5ebcc18b70c5deb19ba6924fb76392d5130b0fe712e3af7a4e4bee18e21 SHA512 0a40e0acce286d45829451fe30efc1bece4924c349c81c377aacee26afe34f032ab6624207d9f6ebb4a3d6f4e2984d63a5601a3728b208045a9a33e0816c1ef2 WHIRLPOOL fe9a4468ceba020f199b89e8a6fa533e9345584dcb2a616f15187193f2145f99336c733fd9b8e9a8178d6ad73a8e3a20d6493a250fdafb3a29dde93695d5cb0d
diff --git a/dev-python/rebulk/rebulk-0.7.3.ebuild b/dev-python/rebulk/rebulk-0.7.4.ebuild
similarity index 100%
rename from dev-python/rebulk/rebulk-0.7.3.ebuild
rename to dev-python/rebulk/rebulk-0.7.4.ebuild
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 7755fddad414..26aaa3b6916e 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,3 +1,3 @@
-DIST s3transfer-0.0.1.tar.gz 9465 SHA256 2bb9ed8db58af94dfa78f75f554d646dfe4b4741fc87f63a20c2bfb3f70f4355 SHA512 77ef39d2043b7ca7cfa105d3a682881392ae8048dd2e1263a9c88390a28e24578e49733afc330ace78027c1a3e3ff5401b30fc12f8a5fac70544bda099f33461 WHIRLPOOL 6a31f8d40c649a244d6f43deb97bc844ad2cb61856ab9e07bf527d8afa576decc22d962baeeec64ea96c715e01a6f9731bc4db49a68f48017a189d8aa95db7b9
 DIST s3transfer-0.1.1.tar.gz 82198 SHA256 6b9131b704819b0e559a97eec373ff6cc8a9b258e4c8f58ad339650b5019f00f SHA512 3e784b8e5a723ff18d587d8dc56bec3737f4be7c644320d5a9eba25b28912cb9ce488f4d37ef48c507eef6e1df6cb30dfd22109231a8cadb6f0d63ff40ae712d WHIRLPOOL 64447ef8ad10b02712b63e8dc5c9708827c4234e01571d825e7a10bc0645c5b0e11968fc43c2b4589bff7355efa639db65ae8c95d3645f3cffc83176bb246415
 DIST s3transfer-0.1.2.tar.gz 82681 SHA256 779d0cd9aa30fa65c6e8da8dc203d165ef7aa6cab0b7faa502b850e6cb9236dc SHA512 96cdc5744ba4297205d82d07aa5b8883269e59c9462baf1bd742ae6be385f17da0803fe09f3a2161c918f04a7c422f82d8e7075ea29d4424fc752a750dc98a6f WHIRLPOOL 14d367b8ab592b27c15519d0a972979baaef9ad3acf293e0908c70df7d3b2dfb4dfefac033490ca9f7fbab1e30b19b414daa73fc516c8f974b4eafd989a462b9
+DIST s3transfer-0.1.3.tar.gz 83873 SHA256 af2e541ac584a1e88d3bca9529ae784d2b25e5d448685e0ee64f4c0e1e017ed2 SHA512 c05ebd67f8295cd595ace77aaf1f437fa4572bfeb31a06df336ba05a17b8d420ce29ff3ba06ce31f75d8a8e9f43bf4dc23559fa1e78e477370ca989010fe23e1 WHIRLPOOL d62df0fb99647e82d82331f953eb943f9e03e930ef9529882e18fe6bcd886f7a8386b9aafcfcae1146b3c5e1f71d9d3d93bbe63715eeeefb5b4fb773f3245cc2
diff --git a/dev-python/s3transfer/s3transfer-0.0.1.ebuild b/dev-python/s3transfer/s3transfer-0.0.1.ebuild
deleted file mode 100644
index eb56624064c1..000000000000
--- a/dev-python/s3transfer/s3transfer-0.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Amazon S3 Transfer Manager"
-HOMEPAGE="http://pypi.python.org/pypi/s3transfer"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/s3transfer/s3transfer-0.1.3.ebuild b/dev-python/s3transfer/s3transfer-0.1.3.ebuild
new file mode 100644
index 000000000000..7ad1e5c011db
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-2.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
+"
+# Pin mock to 1.3.0 if testing failures due to mock occur.
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 296eec730af0..2b4f082daaf0 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,4 +1 @@
-DIST sh-1.07.tar.gz 24554 SHA256 8eb743d1ccf03508022e5b5cd76063320cfe36f039a3625dce703a810a5f57e1 SHA512 922d674c0378fdc13b2934e345d9d0e63b1e9ad1e0fe140cfac981546b50fb5a66f6c423382a60a87c2acd44c625d1d4e6036587015cdbaa682b471678dde185 WHIRLPOOL f649a09433fcb4c7d1d79e6fa39fd137b288f6413c2dec0e092831d063c63dfbd344746a1e4c29ac476b46955989c4eeadce6c26f2a4011d28c696186a3b1587
-DIST sh-1.08.tar.gz 26310 SHA256 4b9700496659e1aa44bb2292ecb6c7d0c5d7763b184fd7eac37df0f2ded4bae8 SHA512 84c8c4f2f5e35ac329e892266e16a9ec23cf363456ba94f43488c0aad8a323ee5881287dea34d1b3b37431e0a6e52c989de0f9296a8eab8434ac22da5b88d8fa WHIRLPOOL 4a4daea1252d3a6b1de8bbeb7ed1831ab90942910c67b28b293133ca844b441376a03becd6ac41420b73d9c85b0aba882bc0e30441f7899e6fc67820bfbe4dd2
-DIST sh-1.09.tar.gz 26382 SHA256 f3d174e2ad25c39f28935bae672be51aa083063d3122405ceeb2a3e7a8239d45 SHA512 a4540a924ff8698c795a618ba8d5ef3dc0dca1880f2f6152393be204008059adda867deb7cc97db361a0011573e5dda6f4daef6cb60f637aa40a710915236771 WHIRLPOOL 9e83d6c231fc24a538544d7920c572f4f5aa3e98e5d82b6b4f478fe828e59ba511685643db31a626bec01751c227a881c93d6f828b35aa3aa7d2b5f5b0c92720
 DIST sh-1.11.tar.gz 36821 SHA256 590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4 SHA512 ccaf178384b5a609c00bb44796a6bec088750414385f19b2d8ffcb93cc8f5ddb6bf82fb966d2bf519651f6efed54258a3c6542a9827d01e6be64af8cb8f86d3d WHIRLPOOL 9d13a3364ec467b492fb5818ae00e3a02f81aa779319382450df76a3041efb047dac82bd249cb51bf819664a5e7a8f9def3a672b8eb2edaa24f2a2aa80d66129
diff --git a/dev-python/sh/sh-1.07.ebuild b/dev-python/sh/sh-1.07.ebuild
deleted file mode 100644
index 43ed031468f7..000000000000
--- a/dev-python/sh/sh-1.07.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3})
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="https://github.com/amoffat/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sh/sh-1.08.ebuild b/dev-python/sh/sh-1.08.ebuild
deleted file mode 100644
index e50de463a3df..000000000000
--- a/dev-python/sh/sh-1.08.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3})
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="https://github.com/amoffat/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-python_test() {
-	${PYTHON} test.py || die
-}
diff --git a/dev-python/sh/sh-1.09.ebuild b/dev-python/sh/sh-1.11-r1.ebuild
similarity index 84%
rename from dev-python/sh/sh-1.09.ebuild
rename to dev-python/sh/sh-1.11-r1.ebuild
index 1a2892d40cb3..d7887107d787 100644
--- a/dev-python/sh/sh-1.09.ebuild
+++ b/dev-python/sh/sh-1.11-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_{3,4}})
+PYTHON_COMPAT=(python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r1.ebuild b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r1.ebuild
new file mode 100644
index 000000000000..3bf8d14389ee
--- /dev/null
+++ b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension cheeseshop"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed \
+		-e '5s/file/open/' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-ruby/actionpack-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index 40b3d0c5049a..bdd5879b2516 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1 +1,2 @@
 DIST actionpack-xml_parser-1.0.2.tar.gz 6623 SHA256 6bed4e15ba11ed4bb33eacae77f15b78a78a0b81a6196203377208d5785178a2 SHA512 6fb9323b2632059d6c253083dfe6a09c413d4a5f7d622457402db95529ccad6d28b0471b01f4555c4e448b65183e6d07ef639de994c47c4858d2bfe5318aaa0b WHIRLPOOL 48f3fccf9207840ac1459026ea094f4c72af68e4b7904a21c9db40f735f9f9ccef5be84bc47e7687ee424ebcde17d3553db95eb2cf88cfe05a0fafbbe46b2e55
+DIST actionpack-xml_parser-2.0.0.tar.gz 6499 SHA256 f2aafb0c9e935ce6b7b25a8c947d46fef4dd091e145b6f93cb8a7d7d4d638a5d SHA512 fb1a9c551a3ff6751e0b9e95b1c667ef5dd6da50b4e5cf4d010468f76d022cb437b20a02e8ee795da757de98e3e45e8b71b9f37f2c0dc16f1a338f8d335d712f WHIRLPOOL 6e30ed00ab7a579bef827ed52276a8fb98a0f95b90dc8408e72b98d910d08645ec4c06e42a54e4b5b3c077501847176638112c0b8694919b5ca72138e4ae7435
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild
new file mode 100644
index 000000000000..a6e535956291
--- /dev/null
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
+HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/actionpack-5*:* =dev-ruby/railties-5*:*"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
+	sed -i -e '1igem "actionpack", "~>5.0"' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}"
+}
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 56663685a810..1c86bf7be2be 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,3 +1,4 @@
 DIST acts_as_list-0.7.6.gem 25088 SHA256 a8c1c2056f55968c31bf094dd15f557b5cea6f7242ab853d30cd2456b8339c18 SHA512 1009f934ae046723a336208a59c1b6fd31b9b2df38fbe5fe0bed29b928fb16296c8869fb035e8865d4c712a572fcd31868601195d9921f4ec8dfc01854f40eb0 WHIRLPOOL 745dd86398ca4bb06ab1c1d1de3b8a121383beaa836523f98046b15f4157ade661bc63457c7d0135ca7dd3c852b3052ccca4439f7375897cd5b2541baa4ef505
 DIST acts_as_list-0.7.7.gem 25600 SHA256 dca206b32860e6c846f747bc3fd4a820875830f7926260d0b093200b4b33e982 SHA512 e343c839ce4399851c33746c68aaec95b3b5e526943c9bd5209a5d2793ba18c53620b6084589271ea88d504ee6f9fed6e8a332e2da52ce3cac89a1f2abed5954 WHIRLPOOL 2a8f17b451033b96b3eb82dfe5d234ca07fbdff3028b373ea95359ba2a6e60a6e951cdb01af508bb8a44c832fd2cfda33b0f7bb0cf98a4345f96929a1e76d23d
 DIST acts_as_list-0.8.0.gem 26624 SHA256 262f368602a8d0039fe63a514548b8899ee7bd9df5dd74cc83b076f6fa0fd8aa SHA512 66cf173a5b5bd1d3c50ac65b6c90a6ac42a42ba815188da3066abca84bd05c95f2e54c34902bfae704839345807f3d4dbdfd920f15320bda802efaefda800b51 WHIRLPOOL 97fd010ce3b98075696b0a39150be59c91c82b6cf4e3dbdca2d8860b3d4800d3ee82e3f1a0dc77caf1638d80db4a52c83054164848583f24398747eced5a3681
+DIST acts_as_list-0.8.1.gem 26624 SHA256 2df2d08e8be17dc51169b730649abec5c4d342d511769e5e40f5e826069f84b5 SHA512 1d2e3b934a8846097662cfe4af81392eb0d176ff08a4c4ef6e422cf5404e9daacc0c5478642f4ef15d9874aca9aee7788b54077b958b96ca9cecf2b50343c8b8 WHIRLPOOL a65793c8b5821613d0585615945eab08caefb94cb89d5427d6f1c347833a741d0bef16461ea05a95c479755d0a7f90ab8b3546e45df5ef0093acc64ea05d87ee
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.8.1.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.8.1.ebuild
new file mode 100644
index 000000000000..95ad760154ef
--- /dev/null
+++ b/dev-ruby/acts_as_list/acts_as_list-0.8.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
+HOMEPAGE="https://github.com/swanandp/acts_as_list"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~x86-macos"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		dev-ruby/activerecord[sqlite]
+	)"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '1,9 s:^:#:' test/helper.rb || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild b/dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild
index 647a732afffc..478037b4a122 100644
--- a/dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild
+++ b/dev-ruby/debug_inspector/debug_inspector-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-4.2.1.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-4.2.1.ebuild
index ec1187a36a4f..952d7765c725 100644
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-4.2.1.ebuild
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-4.2.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/rbtree/rbtree-0.4.2.ebuild b/dev-ruby/rbtree/rbtree-0.4.2-r1.ebuild
similarity index 89%
rename from dev-ruby/rbtree/rbtree-0.4.2.ebuild
rename to dev-ruby/rbtree/rbtree-0.4.2-r1.ebuild
index 5d75f6e6746c..d9e7e68c48c9 100644
--- a/dev-ruby/rbtree/rbtree-0.4.2.ebuild
+++ b/dev-ruby/rbtree/rbtree-0.4.2-r1.ebuild
@@ -3,16 +3,15 @@
 # $Id$
 
 EAPI=5
+
+# ruby23: fails tests
 USE_RUBY="ruby20 ruby21 ruby22"
 
-RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README"
 
 inherit multilib ruby-fakegem
 
-RUBY_FAKEGEM_EXTRAINSTALL="rbtree$(get_modname)"
-
 DESCRIPTION="Ruby/RBTree module"
 HOMEPAGE="http://www.geocities.co.jp/SiliconValley-PaloAlto/3388/rbtree/README.html"
 
@@ -24,6 +23,8 @@ IUSE="test"
 all_ruby_prepare() {
 	# Fix test for random hash ordering.
 	sed -i -e '527 s/flatten/flatten.sort/g' test.rb || die
+
+	mkdir lib || die
 }
 
 each_ruby_configure() {
@@ -32,6 +33,7 @@ each_ruby_configure() {
 
 each_ruby_compile() {
 	emake V=1
+	cp rbtree$(get_modname) lib/ || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/shotgun/Manifest b/dev-ruby/shotgun/Manifest
index 37449384e717..e3b3a2b4633e 100644
--- a/dev-ruby/shotgun/Manifest
+++ b/dev-ruby/shotgun/Manifest
@@ -1,2 +1,2 @@
 DIST shotgun-0.9.1.gem 16384 SHA256 e426e4557ddd3a9a7015b06934aa30dc9038faf04bff5c5e9cd93a599c73ae8d SHA512 eae31007c4a27a660d4bc8bd0b87b4281c1c50a6c9c4675e492b8914a412dc5a2f21998f8b9105b0ada64600c1322d0bd936c4fd4b032dc57aaf1612827208f7 WHIRLPOOL 1bdce842ef3eb606a860052ea95315eb57e3237bd44d4aa76c5e360018377135ae69364e7550041f4492924bc7328b71b7be0203f566a02d004859396e6f68bb
-DIST shotgun-0.9.gem 14336 SHA256 5518285ff9494a36841345985857fb848aeab9981bc2c0d964f08c10315045a5 SHA512 55bc886df596606db9324da4441e3b9585355dedeca0e135b50c52a46640efa83dd378b5e86b35d631b51c4ad8839313809d88932282447b30a23a9bf2827196 WHIRLPOOL 15cecfacdb7b2d6fbdb5982915e37f4eeb48fec5b95f05e84464b23f31623658a5da85f2142f671d5312f47e0d67a95e536db2e6ef3ead29b0d005797adf3274
+DIST shotgun-0.9.2.gem 16384 SHA256 4ef19e63f98c620272666c98fa63e1e733c880b2ac112ac31578918fa2670411 SHA512 62228b0b8bdac815e2204fd89d3e106d033cfee7668ef12406120e5a21f52770ee36c6fa7b3edf3eaf09bdfde5849239364d3483a817914024c21618897e8d9a WHIRLPOOL c0143ba3cecf1281210b2cbfe4b68c68a13233750834a9ab2e3029fd5bf7841a8d499088cf249be0d3f7d95140202a3be141308d6760aa91346479ae37ac2bba
diff --git a/dev-ruby/shotgun/shotgun-0.9-r1.ebuild b/dev-ruby/shotgun/shotgun-0.9.2.ebuild
similarity index 65%
rename from dev-ruby/shotgun/shotgun-0.9-r1.ebuild
rename to dev-ruby/shotgun/shotgun-0.9.2.ebuild
index 1d855998fa3c..e9c39b357f46 100644
--- a/dev-ruby/shotgun/shotgun-0.9-r1.ebuild
+++ b/dev-ruby/shotgun/shotgun-0.9.2.ebuild
@@ -3,17 +3,17 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
 
-RUBY_FAKEGEM_EXTRADOC="README"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 
 inherit ruby-fakegem
 
 DESCRIPTION="Forking implementation of rackup"
-HOMEPAGE="https://rtomayko.github.com/shotgun/"
+HOMEPAGE="https://github.com/rtomayko/shotgun"
 
 LICENSE="MIT"
 SLOT="0"
@@ -22,9 +22,14 @@ IUSE=""
 
 # Warning: the code does not use gem versioning to make sure to load
 # only the right rack version so we might need to patch it to work :/
-ruby_add_rdepend 'dev-ruby/rack'
+ruby_add_rdepend 'dev-ruby/rack:*'
 ruby_add_bdepend "test? ( dev-ruby/bacon )"
 
+each_ruby_test() {
+	${RUBY} -Ilib test/test_shotgun_static.rb || die
+	${RUBY} -Ilib test/test_shotgun_loader.rb || die
+}
+
 all_ruby_install() {
 	all_fakegem_install
 
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index d7665f662f91..6e2f5ccf8a0c 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,2 +1,3 @@
 DIST web-console-2.2.1.tar.gz 37554 SHA256 147727d34bd4165a0c214a7f2761e2999dd4355f11661acb6da43f414fa33f9e SHA512 832838a975f805b8c35fb03233fc1a39c90ba5c36908b4e3fb355bcad3b7b7113cbbb2544474948453353a89953cdd2fecdd71bdbeab5ab06f71bd7f67a3be31 WHIRLPOOL d4d1e55a1864daab086e86e33debc800afb90c099556199c7cc13bfbd25098420df1756171f2722aecb449fec1df60a3f79725216ff3b28b8658de3369f0aa10
 DIST web-console-2.3.0.tar.gz 47641 SHA256 8caf3bc1a9c426bb5f1745ec23da191589af4dc8e8ca9d0a359ecc9f8bf68efb SHA512 36136242012053c2049b0faef682a8fe79f931904cd1007a6e08f36aca7a8923fc47fc058304f11cc0b205db876ca77b1cca65048c8ba4db401123ed9c05c834 WHIRLPOOL fce26e3ab6a11187c3cbeb25d6529fd60d83bdcd384e221b9e7c68e2a48639ee2c9a04c9ee7d91d7ba3bd77fbdaa05e4fe333f4f38637264e18536d4e8ce82a9
+DIST web-console-3.3.1.tar.gz 46556 SHA256 767c2aec4501d5b3bc81958ff374ea8a5367ea52606df1ea235b62fe36afbebe SHA512 8acb619b47c4b91fde647b83c01ae57f25a329b2597801e51c5e2d4dfec0a232e9335528672ff036a2391677ba88679ae69fc9aeebd960071b7a8541bfe9667f WHIRLPOOL 3717e6aebf6de9a759ac8f305c28e02c6acc46f4ff7f00fa294ce98f84f03069c64e566a1832babde4aee610fb5e20997d7fd136961ebc766481147a877a2609
diff --git a/dev-ruby/web-console/web-console-3.3.1.ebuild b/dev-ruby/web-console/web-console-3.3.1.ebuild
new file mode 100644
index 000000000000..89e756266742
--- /dev/null
+++ b/dev-ruby/web-console/web-console-3.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A debugging tool for your Ruby on Rails applications"
+HOMEPAGE="https://github.com/rails/web-console"
+SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/actionview-5.0:*
+	>=dev-ruby/activemodel-5.0:*
+	dev-ruby/debug_inspector
+	>=dev-ruby/railties-5.0:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/rails-5.0
+	dev-ruby/sqlite3
+	dev-ruby/mocha
+	www-servers/puma
+)"
+
+all_ruby_prepare() {
+	# Use an installed rails version rather than live source from github.
+	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
+		-e '/simplecov/d' Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
index fa99eaa0ade8..0527a587662a 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://latex2rtf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/latex2rtf/${P}a.tar.gz" # 'a' is only for 2.3.11 version for fixing a tarball generation bug
 
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 S="${WORKDIR}/${P%b}"
diff --git a/dev-util/cmake/cmake-3.6.2.ebuild b/dev-util/cmake/cmake-3.6.2.ebuild
index afc6671bf564..2e5926c3b77a 100644
--- a/dev-util/cmake/cmake-3.6.2.ebuild
+++ b/dev-util/cmake/cmake-3.6.2.ebuild
@@ -130,7 +130,7 @@ src_prepare() {
 		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
 		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
 		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version ${CATEGORY}/${PN}; then
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
 		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 		cmake_src_bootstrap
 	fi
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 3b192d95130b..1821f58c08b1 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,4 +1,4 @@
 DIST debootstrap_1.0.75.tar.gz 61897 SHA256 4fdc5daf7bce3816a7faa916e7cbd6d45357f241f0d845bec0015c06fd7c7cd6 SHA512 bbf4a9e33ee0b398064aa12ba77c7e2ad8fba0e050a8d821341c9c065f8554476aaa6c67f93e3255f85828b98643080f331aee9de6a901a9d5fb5cbcb8ed6beb WHIRLPOOL dca8e385102ef03ea970320fc1fea8a8f44fc09b78384591911df046afb0f14157e90fafb3cf8c021ea7568e22eea9f26674eb07cfb25b21ed72810cf0957c7a
-DIST debootstrap_1.0.80.tar.gz 64351 SHA256 a693c1534ced650c80f50a623fc9dd3daada5115fcd8c3b6e6470cd1987ef119 SHA512 4bcb87e54de1abd5c2438c91933ef136a6bdf55c68038083acd5658637d4d5ba55544c11f8feb731f3c0ed743b7ee1ed00015eed569db3797fef42b9d532f367 WHIRLPOOL 75f8e9b5595b1c8dcff1a2393eaf775302d6c17eafcae5fdfc85a233d8429592b4dfef2c8ab46e32ff9de440a498cf0289563795e109e128a292b99582f46eb3
 DIST debootstrap_1.0.81.tar.gz 64394 SHA256 344c7f841504c262d5088e9618f1d5f79bc122bffbb1dce2873c5e38029bdfb3 SHA512 3869f98070d3a5d2f41824fa9caaae97cfa408e01f356358568df91015970bf3624e93ed4b7666a086d42883fcb1d061f5854a8ece90d0ffdb685c898cb9462d WHIRLPOOL aa3ee424392fb0f26471ce1fc68418c2026cf452506e89388bdd9c29d0cf002b98aa67c0ad8997ec1d13679b22cb3823fe9ea3cd53e39c2cc706cc992f3e0b6d
+DIST debootstrap_1.0.82.tar.gz 64344 SHA256 db0dfad15d5338a8cdbcc3bbfda8dc59c58edf07511303f31746ef6fcc733835 SHA512 0279477b90271c12a4d73b075d45263d09dfe0f3d78e03d316a20644d697e40b65025e24fb6804f97d64eef79a7d250ea87f4557eb444ef37732bb8363cec718 WHIRLPOOL 3bf045167d14b75db4632071028b89dc96223cf950f2f4ed8c3761143ec8c17ac0c992b4fe286586aa0adfc0ec8e3cbb03de351842694f251a63682817695146
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
diff --git a/dev-util/debootstrap/debootstrap-1.0.80.ebuild b/dev-util/debootstrap/debootstrap-1.0.82.ebuild
similarity index 100%
rename from dev-util/debootstrap/debootstrap-1.0.80.ebuild
rename to dev-util/debootstrap/debootstrap-1.0.82.ebuild
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 242ee126a21d..2b5b2e4fbef1 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1 +1,2 @@
 DIST gcovr-3.2.tar.gz 343748 SHA256 5a969caf61452705a39f6642f4707d23644bdd2e5ef913014bf95c4bd0263db6 SHA512 b8a810cb156acc1bbff108002f49b358c5b4044a6450c9b6a7a682c841e95f8159d42e4a8a1c4742fa82da1e99085ef4ede29a483291be4d79dcf09003829a45 WHIRLPOOL 341910e1f04e3dbb10b3f703237b690e5b4b72f8148fe8d108ed7013f3760dd48383ae31198e61bcdfecbe545f66d76c4a65082ab616ad8d61dafa9694d158a0
+DIST gcovr-3.3.tar.gz 323226 SHA256 8a60ba6242d67a58320e9e16630d80448ef6d5284fda5fb3eff927b63c8b04a2 SHA512 e5046bc4e38c99691c3bcc58abdfbbe965c46d02c8c50dbf135bd5108bd9bba1fa450ab0b5e23157a178f7c1303ec9c285470e9be1a14274528e5d7051013a08 WHIRLPOOL 866da190bb78453a71a848e8880ec35bb2b1024ec043f9309a3a0b4d9fe32d33c84cbc82376a77b5e16bba394c72d1ca636d9bc1827910a3d3b936f1817f0d4d
diff --git a/dev-util/gcovr/gcovr-3.3.ebuild b/dev-util/gcovr/gcovr-3.3.ebuild
new file mode 100644
index 000000000000..e1b5f06c9332
--- /dev/null
+++ b/dev-util/gcovr/gcovr-3.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python script for summarizing gcov data"
+HOMEPAGE="https://github.com/gcovr/gcovr"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 506d59728242..122f6c52c179 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a WHIRLPOOL 2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
 DIST qbs-src-1.5.2.tar.gz 902972 SHA256 059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70 WHIRLPOOL 0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3
+DIST qbs-src-1.6.0.tar.gz 928684 SHA256 ae850e957e4a811a193b02a067321722dd0e5fc50b7c370ec34273c1565e78ab SHA512 20e3a0837a5503db9a150df566122b85bb74a8f4e604afd32b83464ddbb36eb4ea93de0b05aaaa7f7403477f56664326f8e43bdf92d9a3a15512918e83e5c56a WHIRLPOOL cba7b95a3aa3941336f2e14f315634c8910a4f205ecf60c99ef2d75dbb69eff24209d9cad41096cb3912fa37c8d011cc6c44b5b229ece55d5cf936e898ec0a4c
diff --git a/dev-util/qbs/qbs-1.6.0.ebuild b/dev-util/qbs/qbs-1.6.0.ebuild
new file mode 100644
index 000000000000..8ef1ef8428df
--- /dev/null
+++ b/dev-util/qbs/qbs-1.6.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Cross-platform build tool"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+RESTRICT="test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	if use test; then
+		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+	else
+		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+	fi
+
+	# skip several tests that fail and/or have additional deps
+	sed -i \
+		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
+		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
+		-e 's/p\.value("java\./true||&/'	`# requires jdk, fails, bug 585398` \
+		-e 's/!haveMakeNsis/true/'		`# requires nsis` \
+		-e 's/!haveWiX(profile)/true/'		`# requires wix` \
+		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
+		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${WORKDIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 4bc66008aefe..f706b247df74 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-clocks-3.18.0.tar.xz 870864 SHA256 ca0818ec89e3539201da6b5388365e3d66df815198beccc90e2be44c7822baa0 SHA512 70e0b21c9dbacc4ad74150724dcde038737ad4bbb38d76c2ac18b07d6afcfc7c60a34224de684f8cb52e3f621ff533872c5b423953ac3ba726511d6eb9b348d7 WHIRLPOOL 82f8ce77aa8e28df3d0481c0e35282d2156b4c9c3e1e5266e1a9bc120bf59710ee1cc29694d53d21dd2e8cb704f1779e4287a64b2cc592e0a670e6cacdd07d9a
 DIST gnome-clocks-3.20.1.tar.xz 905072 SHA256 92ad7b409c5118464af49ca28262ae43e9d377435ad2b10048b23e6e11ae476f SHA512 8e7ea791f40d2bff0634e70f48baa57965a293f039de38df56fb6de00920bf3b7d1ce33e1d1643798aae0650fff13d4f4e4100d03654257461861c12a6dbf7d5 WHIRLPOOL 97edbf161be830eef18b3c3bb3afb6c8dfac6d21d5085e84ff66243cabc2af36b3745603bb02d4a8451c557a8c067d7bbaa10100771cf11e44f30fcb97c90ad3
+DIST gnome-clocks-3.20.2.tar.xz 905292 SHA256 7db01207eb9632cec748772b859900313732eacca652753d771fd99a32713617 SHA512 95557f84c3601c306c7087d4d7909a3a456e71ab1b389425a2d48479f6f2baadf1f0a465e7e94054f8f5f8939b398d1d7d387d1bb7989d3ec321bd51c9e833d9 WHIRLPOOL 5f83e81fdd4133559b2a51368efc4510dba8a5b92bf6527baecfdfded85e95d392732d3bac49ba77e183de95e75d0d967c086b5ea8a3de6e4629940936a54336
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.20.2.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.20.2.ebuild
new file mode 100644
index 000000000000..e117a9243385
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.20.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgweather-3.13.91:2=
+	>=gnome-base/gnome-desktop-3.7.90:3=
+	>=media-libs/gsound-0.98
+	>=sci-geosciences/geocode-glib-0.99.4
+	>=x11-libs/gtk+-3.19.8:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index e6d6020c9237..d9737f67e0f1 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-documents-3.18.3.tar.xz 2297720 SHA256 16a50d509d43009d58b44b5f6d4d92e155a55dcb22bd8e0fdfd63b8d2ab48b91 SHA512 69129100858434c99d3a47bfa776637e8d26eda5eb40d089f1c32da6ef1ecc3265c17cbcb657e944559dbca788445a66956c7aabbb24167ec095d8af4f4d29de WHIRLPOOL b5be7ad7ed8bc1ad484a94a1b83dc53389277181a63ccf16519b7bcf798e471082fa4d133173a6dc55628ba3a7ad2e37c8063f987ffd00a38c59efdea7749942
 DIST gnome-documents-3.20.0.tar.xz 2319732 SHA256 a5fa496c5e80eccb8d2e5bba7f4d7dc4cc6c9f53d5bc028402428771be1237d2 SHA512 f69c48f8c343e674aca77f3334ce1a10d30f90f2dade5722d7c0b759e67d2c633199d510ff3c70a202e7ed6b309d93035eb35c4ae554a8da83aefb78fafeacaa WHIRLPOOL 5d7a537bfc19130646e43239acd51fa21154b4a648e0be895252c55ea84714d2a26c876862781c56d365222d1ad36fa71bac7d6d40edd31ec5ea951b06e7edb9
+DIST gnome-documents-3.20.1.tar.xz 2327412 SHA256 c73810ded97431360ba80c127d3244b1e6e416643fba0ba96411d22729211394 SHA512 f879a9761f5a34cb006a7df3933dfbd8f4c54e3fecf1601bd48d05a0994821eb8e7f5ba54f7ac5a2b6cd9674b733dd74445592d1e20f6903073965ec79072916 WHIRLPOOL d66fd64403d27610725562edb444ee93108984a7b5dec7dd7322f896734e75241f67e3939cd0000f4031f531c9b9fc3354d13436394725fa845a25096596498c
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.20.1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.20.1.ebuild
new file mode 100644
index 000000000000..104aee257015
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.20.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
+COMMON_DEPEND="
+	>=app-misc/tracker-1:=[miner-fs]
+	>=app-text/evince-3.13.3[introspection]
+	dev-libs/gjs
+	>=dev-libs/glib-2.39.3:2
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
+	gnome-base/gnome-desktop:3=
+	>=media-libs/clutter-1.10:1.0
+	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
+	>=net-libs/gnome-online-accounts-3.2.0
+	>=net-libs/libsoup-2.41.3:2.4
+	>=net-libs/libzapojit-0.0.2
+	>=net-libs/webkit-gtk-2.6:4
+	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
+	>=x11-libs/gtk+-3.19.1:3[introspection]
+	x11-libs/pango[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/clutter[introspection]
+	net-misc/gnome-online-miners
+	sys-apps/dbus
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index fe3ee790e664..6c229d48849a 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-user-share-3.18.0.tar.xz 376944 SHA256 feb3bed59193eafea31f563ed7eab5f066aa5f86d4a89f067b162653d168d3fc SHA512 bc053b879c602f2d6d04431f817f528c7f6ffb20e2078fcef1b4cc8acbe95a658fb6cfe03b55fe87c46bd87ea175cfdfda8314928e9c3525ccf2fa8ab0fdf055 WHIRLPOOL 72c43048afae3888306c8033d63458df7fd806bf21c99405b72b5694e03e73fc5a43473671da978aea5ae223f9bf4111a809c0a9f17f47f7d38a55dd25f08817
 DIST gnome-user-share-3.18.1.tar.xz 388940 SHA256 3e64dacfadd9bdfbf080223d95e938b5b5ae4195a44cd75f51a4bb2547fa2cdd SHA512 2edf2ae13162020625dba1784ed06542f4ccedb981a3ad70455a26edf52bf64aa3fc02290a650dabe5f939b80dad67ab3d7e9551b9f3a6bd7998b0301df1918e WHIRLPOOL 12b758cd4a40aa7a72560f44e5b8d36c0335895617e0007225b5b807bb9291d14969dbe7b76795ea1246dcb2d49d90991fe87e15db3b32d50d38fec35240e5ad
+DIST gnome-user-share-3.18.2.tar.xz 347712 SHA256 155ddbd7d467e9b2b8f39fade93244d6124652f4985e286364ceeaa3357ece35 SHA512 157a3b83ec0de6c64a94f86eb76f5b16174b1adcaab79e4adb259b86c96ec9ecc76f0629a8674a14405f227fc8a0f45d98ec0bf93ec773b08c1233b682167f62 WHIRLPOOL 7d7ea259a6def54f71fb38f5834585519ebaaecf82dc128a16a54bb3ce29dd87fec96a9ed71b03b5c4baea17cec6dbf55cb911d3bd3fc3df365ac83476cad76a
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.2.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.2.ebuild
new file mode 100644
index 000000000000..f25894e2ec03
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib systemd
+
+DESCRIPTION="Personal file sharing for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# FIXME: could libnotify be made optional ?
+# FIXME: selinux automagic support
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/nautilus-2.91.7
+	media-libs/libcanberra[gtk3]
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	>=x11-libs/libnotify-0.7:=
+"
+DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-3.9
+	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Upstream forces to use prefork because of Fedora defaults, but
+	# that is problematic for us (bug #551012)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
+	eapply "${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 212bf251b93c..1d68f249dde4 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,4 @@
 DIST network-manager-applet-1.0.10.tar.xz 1374084 SHA256 b045ac3eaa68ccbbefe91510ad67b4002a7e09d1e5ce1c4bf9a67619bd2cf0eb SHA512 dc13881243e5232d0c45563442f906a93c4d196a69c52c45d335f755bbc73c4d3131ba59180a102f65ca2066d40127b9db8cf85da2b41ec18efda482a9d210aa WHIRLPOOL c1a731927289ebef627cfcd930574f4653d971b787a55acc10c8cc21933ca41010845daec72ec6a918fba894b134fdaa558da0f6e91e65f84b1d1f97587c4431
 DIST network-manager-applet-1.2.2.tar.xz 1291712 SHA256 02b42e7c17c9cd6c840563750da92ce58da1ec621df7f0c2402016026e727756 SHA512 1a763acc045b56f56d1faba17ec1523969f9b202a611bef7a52a55c3658a29acf6e9eeee1666274e09b5dbfe2895afc728f119da2a8edca0f11de55c42e1e382 WHIRLPOOL cdff6c96b54a59d0193f90f51420818ff9bcc01762be2b1cf90fc2f2791e0873235fc9890d757f5fb0dbfd6bf4a9646c1c569512c18edd5c72b1fe5549f16305
 DIST network-manager-applet-1.2.4.tar.xz 1321740 SHA256 dff72956c939743e899954c9d32f0ebff4f213f1307a8157adc548584a0da37a SHA512 0cf9dd2db3289b29e550f96212c425c807b4a425d6a98cf00981e44d2bd5d1eb41c482072b5b030f32ae744c27f49a7757d762f7eda17cbba90560f0b3af1a30 WHIRLPOOL e2157108be89cbfab2327ded1bbee101c2332a5b8f85d3ad4bd490b4e4bcfb07f751d87ade9ef9538c2a1004abd6c146c6741eacd5c8825ad8392d40ae9b2277
+DIST network-manager-applet-1.4.0.tar.xz 1318520 SHA256 d9f5f1e151b8edbbcebb6f818eed9a49b53aadcb4e8aed2cae4fc09996278331 SHA512 297ad55a311dfb759f756cc4949ec39156a7ba83e42e14ed104e119eb753f186a11f108be640eecae31d96be6a026e37dfb10f9e1a664d0e158d7c720b48de1a WHIRLPOOL 3f4747c0706b55729f9f3ac6d71cbbe81e9c2f0e084c16759ffa7a7f393daaec72f4ecfa72330c2a0584c63c8d739123f9910ec8007a063066bc5e71496f8c24
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index dc2b82dcf31e..96fdf3e479a4 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
 		<flag name="modemmanager">Enable support for mobile broadband devices
 			using <pkg>net-misc/modemmanager</pkg></flag>
+		<flag name="teamd">Enable teamd configuration editor</flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/nm-applet/nm-applet-1.4.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.4.0.ebuild
new file mode 100644
index 000000000000..b0aeb2f074a9
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection modemmanager teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	app-crypt/libsecret
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/dbus-glib-0.88
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3.4:3[introspection?]
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?]
+	net-misc/mobile-broadband-provider-info
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	virtual/freedesktop-icon-theme
+	virtual/libgudev:=
+	modemmanager? ( net-misc/modemmanager )
+	teamd? ( >=dev-libs/jansson-2.3 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	virtual/pkgconfig
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+src_configure() {
+	gnome2_src_configure \
+		--without-appindicator \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		$(use_enable introspection) \
+		$(use_with modemmanager wwan) \
+		$(use_with teamd team)
+}
diff --git a/licenses/Skype-TOS b/licenses/Skype-TOS
new file mode 100644
index 000000000000..619c859e5fe3
--- /dev/null
+++ b/licenses/Skype-TOS
@@ -0,0 +1,1455 @@
+Retrieved from https://www.skype.com/en/legal/ios/tos/ (2016-09-09)
+
+Table of contents:
+
+    1. Your agreement with Skype
+    2. Acceptance of the Terms
+    3. Changes to the Terms
+    4. Licence
+    5. Use of the software and products and Skype websites
+    6. Your obligations
+    7. Proprietary rights
+    8. Charges
+    9. Payment
+   10. Refund Policy
+   11. Ending Your relationship with Skype
+   12. Exclusion of warranties, limitation of liability and indemnity
+   13. Third party websites products and services
+   14. Additional Terms
+   15. Your confidential information and your privacy
+   16. For Government users only
+   17. How to contact Skype
+   18. Miscellaneous
+   19. Product specific terms
+   20. Pay by mobile
+
+PLEASE READ CAREFULLY BEFORE DOWNLOADING THE SOFTWARE OR USING THE PRODUCT(S)
+OR SKYPE WEBSITES
+
+Key Points
+
+   It is important that you read the entirety of and understand this
+   document. There are, however, a few key points that we need to
+   emphasise:
+
+   NO ACCESS TO EMERGENCY SERVICES: The Software is not a replacement for
+   your ordinary mobile or fixed line telephone. In particular, apart from
+   in the very limited circumstances set out in paragraph 5.6 of these
+   Terms (applicable to Skype’s Internet Communications Software only),
+   the Software does not allow you to make emergency calls to emergency
+   services. You must make alternative communications arrangements to
+   ensure that you can make emergency calls if needed.
+
+   CHECK RESTRICTIONS ON USE: In some countries there are restrictions on
+   the use of the Software. It is your responsibility to ensure that you
+   are legally allowed to use the Software where you are located.
+
+   NO OWNERSHIP OF NUMBERS: If Skype allocates to you a Skype Number
+   (previously known as “Online Number”) or Skype To Go Number, you do not
+   own the number or have a right to retain that number forever. Skype may
+   need to change or withdraw the number allocated to you from time to
+   time. You will not transfer or attempt to transfer your Skype Number or
+   Skype To Go Number to anyone else. You must ensure you comply with any
+   allocation requirements displayed when purchasing a Skype Number as
+   failure to do so could result in the number being withdrawn. Please see
+   also paragraph 19.1.
+
+   SKYPE CREDIT BECOMES INACTIVE AFTER 180 DAYS: If you purchase Skype
+   Credit please be aware that it becomes inactive after 180 days of
+   inactivity. Please see also paragraph 9.2.
+
+   ARBITRATION CLAUSE AND CLASS ACTION WAIVER: If you live in the USA and
+   select Pay by Mobile (see paragraph 20), a binding arbitration clause
+   and class action waiver affects your rights to resolve a dispute with
+   Skype, its corporate affiliates, or other third parties including
+   mobile phone carriers. Please read paragraph 20.3 carefully.
+
+1. YOUR AGREEMENT WITH SKYPE
+
+   1.1 Skype’s internet communication software applications (“Internet
+   Communications Software”), other “Skype” branded software applications
+   (together the “Skype Software”), the “Qik” branded software
+   applications (“Qik Software”) and associated documentation (whether in
+   printed or electronic form) including any improvements, modifications,
+   enhancements, fixes, updates, upgrades and future versions thereto
+   (“Updates”) and whether made available for free or for a fee,
+   (collectively the “Software”) are licensed (not sold) to you by Skype
+   Software Sàrl.
+
+   1.2 The features and products that are made available through the
+   Software for free (excluding products or features available for free on
+   a trial basis only) (“Free Products”) are provided to you by Skype
+   Software Sàrl.
+
+   1.3 Any additional products or features of the Skype Software or Qik
+   Software, or other “Skype” or “Qik” branded products, that you pay for
+   (including products or features available for free on a trial basis
+   only) (“Paid For Products”) are provided to you by Skype Communications
+   Sàrl.
+
+   1.4 “Skype Websites” means www.skype.com, www.qik.com (both of which
+   are operated by Skype Communications Sàrl) and any other websites
+   authorised by Skype which link to these Terms.
+
+   1.5 “Skype’’ means Skype Software Sàrl, 23 – 29 Rives de Clausen,
+   L-2165 Luxembourg or Skype Communications Sàrl, 23 – 29 Rives de
+   Clausen, L-2165 Luxembourg as the context requires;
+   “Products” means collectively the Free Products and Paid For Products;
+   “you” or “your” means you, the registered holder of the User Account
+   (as described in paragraph 6.1) and licensee under these Terms.
+
+   1.6 Your agreement with Skype is made up of the terms and conditions
+   set out in this document, together with any fair usage policies
+   described in this document and Additional Terms referred to in
+   paragraph 14 (collectively the “Terms”). To the extent of any
+   inconsistency between the fair usage policies or any Additional Terms
+   and this document, this document shall take precedence.
+
+2. ACCEPTANCE OF THE TERMS
+
+   2.1 In order to download and/or use the Software, Products and/or Skype
+   Websites you must first accept these Terms. These Terms are accepted by
+   you (a) when you click to accept or agree to the Terms; or (b) when you
+   download and/or use the Software, Products and/or Skype Websites. We
+   advise you to print a copy of these Terms for your records. These Terms
+   remain effective from the date of acceptance until terminated by you or
+   Skype in accordance with paragraph 11.
+
+   2.2 You cannot accept these Terms if: (a) you are not lawfully entitled
+   to use the Software, Products and/or Skype Websites in the country in
+   which you are located or reside or (b) if you are not of legal age to
+   form a binding agreement with Skype.
+
+   2.3 In some countries the Products may be provided to you by Skype’s
+   local partner. If so, that local partner may ask you to accept its own
+   terms of service (“local terms”). If there is any inconsistency between
+   those local terms and these Terms, then the local terms shall govern to
+   the extent of that inconsistency.
+
+
+3. CHANGES TO THE TERMS
+
+   3.1 Skype may make changes to these Terms from time to time. Skype will
+   publish the changes at www.skype.com/go/tou. Changes to the fair usage
+   policies and/or Additional Terms will be posted on the applicable Skype
+   Website. The changes will be effective when published. Please review
+   the Terms on a regular basis. You understand and agree that your
+   express acceptance of the Terms or your use of the Software, Products
+   and/or Skype Websites after the date of publication shall constitute
+   your agreement to the updated Terms. If you do not agree with the
+   amended Terms, you may terminate your relationship with Skype in
+   accordance with paragraph 11 below.
+
+4. LICENCE
+
+   4.1 Licence. Subject to your compliance with these Terms, you are
+   granted a limited, non-exclusive, non-sublicensable, non-assignable,
+   free of charge license to download and install the Software on a
+   personal computer, mobile phone or other device; and personally use the
+   Software through your individual Skype or Qik user account (as
+   applicable) (“User Account”). For the avoidance of doubt, (a) IT
+   administrators working on behalf of a company may download and install
+   the Skype Software onto personal computers or other devices used by
+   personnel of such company; and (b) you are permitted to use the
+   Software at a university or other educational institution, or at work.
+   Skype reserves all rights not expressly granted to you under these
+   Terms.
+
+   4.2 Restrictions. You may not and you agree not to:
+
+   (a) sub-license, sell, assign, rent, lease, export, import, distribute
+   or transfer or otherwise grant rights to any third party in the
+   Software;
+
+   (b) undertake, cause, permit or authorise the modification, creation of
+   derivative works or improvements, translation, reverse engineering,
+   decompiling, disassembling, decryption, emulation, hacking, discovery
+   or attempted discovery of the source code or protocols of the Software
+   or any part or features thereof (except to the extent permitted by
+   law);
+
+   (c) remove, obscure or alter any copyright notices or other proprietary
+   notices included in the Software;
+
+   (d) use the Software or cause the Software (or any part of it) to be
+   used within or to provide commercial products or services to third
+   parties. The foregoing shall not preclude you using the Software for
+   your own business communications, subject to paragraph 4.1 above;
+
+   (e) other than for the purposes of download and installation, use the
+   Software except through your User Account.
+
+   4.3 Third-Party Technology. If you are using Software pre-loaded on,
+   embedded in, combined, distributed or used with or downloaded onto
+   third party products, hardware, software applications, programs or
+   devices (“Third-Party Technology”), you agree and acknowledge that: (a)
+   you may be required to enter into a separate licence agreement with the
+   relevant third party owner or licensor for the use of such Third-Party
+   Technology; (b) some Products and/or functionality may not be
+   accessible through the Third-Party Technology and (c) Skype cannot
+   guarantee that the Software shall always be available on or in
+   connection with such Third-Party Technology.
+
+   4.4 Third Party Notices. The Software may include third party code that
+   Skype, not the third party, licenses to you under this agreement.
+   Notices, if any, for the third party code are included for your
+   information only. Third party scripts, linked to, called or referenced
+   from the Software, are licensed to you by the third parties that own
+   such code, not by Skype.
+
+5. USE OF THE SOFTWARE AND PRODUCTS AND SKYPE WEBSITES
+
+   5.1 Equipment: In order to use the Software and the Products you will
+   need an Internet broadband connection. You are responsible for
+   providing all equipment required to access the Internet or enable
+   communications such as headsets, microphones and webcams.
+
+   5.2 Use of Your Equipment: The Internet Communications Software may use
+   the processing capabilities, memory and bandwidth of the computer (or
+   other applicable device) you are using, for the limited purpose of
+   facilitating the communication and establishing the connection between
+   Internet Communications Software users. If your use of the Internet
+   Communications Software is dependent upon the use of a processor and
+   bandwidth owned or controlled by a third party, you acknowledge and
+   agree that your licence to use the Internet Communications Software is
+   subject to you obtaining consent from the relevant third party for such
+   use. You represent and warrant that by accepting these Terms, you have
+   obtained such consent.
+
+   5.3 Updates to the Software: Skype may automatically check your version
+   of the Skype Software. You may be required to enter into an updated
+   version of these Terms to be able to download or otherwise take
+   advantage of any Updates. Skype has no obligation to make available any
+   Updates. However, Skype may (a) require you to download and install
+   Updates; or (b) download and install Updates from Skype automatically
+   from time to time unless you have chosen (through your Skype client
+   settings) not to receive automatic Updates. Microsoft Corporation or
+   its affiliates and subsidiaries may also automatically download updates
+   to the Skype Software for Windows, if you have chosen to receive
+   Microsoft Updates. These updates are required to maintain software
+   compatibility, provide security updates or bug fixes, or offer new
+   features, functionality or versions. You agree to receive such updates
+   from Skype in order to continue using the Skype Software and you agree
+   to accept such Updates subject to these Terms.
+
+   5.4 Suspension, technical improvement and maintenance: From time to
+   time, Skype may need to perform maintenance on or upgrade the Software,
+   Products or Skype Websites or the underlying infrastructure that
+   enables you to use the Software, Products or Skype Websites. This may
+   require Skype to temporarily suspend or limit your use of some or all
+   of the Software, Products or Skype Websites until such time as this
+   maintenance and/or upgrade can be completed. To the extent possible and
+   unless an intervention is urgently required, Skype will publish the
+   time and date of such suspension or limitation on the Skype Website in
+   advance. You will not be entitled to claim damages for such suspension
+   or limitation of the use of any Software, Product or Skype Website.
+
+   5.5 No Access to Emergency Services: Neither the Products nor the
+   Software are intended to support or carry emergency calls to any type
+   of hospitals, law enforcement agencies, medical care unit or any other
+   kind of services that connect a user to emergency services personnel or
+   public safety answering points (“Emergency Services”). There are
+   important differences between traditional telephone services and the
+   Products. You acknowledge and agree that: (i) Skype is not required to
+   offer access to Emergency Services under any applicable local and/or
+   national rules, regulations or law; (ii) it is your responsibility to
+   purchase, separately from the Products, traditional wireless (mobile)
+   or fixed line telephone services that offer access to Emergency
+   Services, and (iii) the Software and the Products are not a replacement
+   for your primary telephone service. Find out more about calling 112,
+   the dedicated emergency number for the EU at
+   www.skype.com/go/emergency.
+
+   5.6 Limited Emergency Calling (Internet Communications Software Only
+   and Not Applicable to the Qik Software)
+
+   5.6.1 In a very limited number of countries, and for defined Internet
+   Communications Software versions and platforms only, Skype will try to
+   provide limited emergency calling as a stand-alone feature but can
+   provide no commitment in this respect. Click here for the listing of
+   countries (“Enabled Countries”) and software versions and other
+   platforms (“Enabled Versions”) that enable limited Skype emergency
+   calling. Skype emergency calling is not available for any other
+   countries, versions or platforms. You should keep traditional wireless
+   (mobile) or fixed line telephone services available for your calls to
+   Emergency Services and use Skype’s limited emergency calling only as an
+   absolute last resort. In particular, please also note that:
+
+   (i) power cut, battery failure or internet connection failure can lead
+   to a Skype call failure, including your call to Emergency Services.
+   Additionally, any of the quality limitations set out in paragraph 5.9
+   below, may otherwise affect successful call connection.
+
+   (ii) where available, an emergency call made using the Internet
+   Communications Software in an enabled country may not receive the same
+   network priority as a call made using traditional wireless (mobile) or
+   fixed line telephone services.
+
+   (iii) if your emergency call is connected, you will need to tell the
+   Emergency Services operator that you speak to where you are physically
+   located so that the correct emergency organisation can respond to your
+   emergency and knows where to find you. If you do not provide this
+   information when prompted, you acknowledge that your emergency call may
+   not be completed and you will not be able to gain access to your
+   required Emergency Services using the Internet Communications Software.
+   Skype will have no liability for your failed emergency call in such
+   circumstances.
+
+   (iv) other than for the Enabled Countries and Enabled Versions, Skype
+   does not provide limited emergency calling in any country or for or in
+   conjunction with any Products or using any platforms, devices, services
+   or operating systems (including any products, platforms, devices,
+   services or operating systems developed by third parties using Skype’s
+   APIs, any of Skype’s software development kits or otherwise).
+
+   5.6.2 In Enabled Countries, you should configure the limited emergency
+   calling functionality by setting your default location for emergency
+   calling in the Call Settings page of your desktop Internet
+   Communications Software (if you are using a 4.1 version for Windows (or
+   later) or version 2.8 for Mac OS X (or later)). It is your
+   responsibility to ensure that this location information is correct and
+   kept up-to-date if your physical address changes. Skype does not
+   support emergency calls in the majority of countries around the world.
+   Where limited emergency calling is supported Skype will not charge you
+   to make an emergency call and you do not need to have a Skype Credit
+   balance. If however your country is not supported for limited emergency
+   calling then you should not attempt to, and agree not to, make any
+   emergency calls using your Internet Communications Software. If, with
+   your permission, another user uses your User Account, it is your
+   responsibility to inform that user of the limited circumstances in
+   which limited emergency calling is available.
+
+   5.7 Content of Communications: Skype is not the source of, does not
+   verify or endorse and takes no responsibility for the content of
+   communications made using the Software. By using the Software, you
+   agree that any content that you submit may be transmitted to the
+   recipient of your communication. The content of communications is
+   entirely the responsibility of the person from whom such content
+   originated. You therefore may be exposed to content that is offensive,
+   unlawful, harmful to minors, obscene, indecent or otherwise
+   objectionable. The content of communications may be protected by
+   intellectual property rights, which are owned by third parties. You are
+   responsible for the content you choose to communicate and access using
+   the Software. In particular, you are responsible for ensuring that you
+   do not submit material that is (i) copyrighted, protected by trade
+   secret or otherwise subject to third party proprietary rights,
+   including privacy and publicity rights, unless you are the owner of
+   such rights or have permission from their rightful owner (ii) a
+   falsehood or misrepresentation (iii) offensive, unlawful, harmful to
+   minors, obscene, defamatory, libellous, threatening, pornographic,
+   harassing, hateful, racially or ethnically offensive, or that
+   encourages conduct that would be considered a criminal offense, gives
+   rise to civil liability, violates any law, or is otherwise
+   objectionable; (iv) an advertisement or solicitation of business; or
+   (v) impersonating another person. Skype reserves the right (but shall
+   have no obligation) to review content for the purpose of enforcing
+   these Terms. Skype may in its sole discretion block, prevent delivery
+   of or otherwise remove the content of communications as part of its
+   effort to protect the Software, Products or its customers, or otherwise
+   enforce these Terms. Further, Skype may in its sole discretion remove
+   such content and/or terminate these Terms and your User Account if you
+   use any content that is in breach of these Terms.
+
+   5.8 Notice and Take-Down If Skype receives any notification that any
+   material that you post, upload, edit, host, share and/or publish on the
+   Skype Website or through the Software (excluding your private
+   communications) (“User Submission”) is inappropriate, infringes any
+   rights of any third party, or if Skype wishes to remove your User
+   Submission for any reason whatsoever, Skype reserves the right to
+   automatically remove such User Submission for any reason immediately or
+   within such other timescales as may be decided from time to time by
+   Skype in its sole discretion. The User Submission shall be taken down
+   without any admission as to liability and without prejudice to any
+   rights, remedies or defenses, all of which are expressly reserved. You
+   acknowledge and agree that Skype is under no obligation to put back
+   such User Submission at any time. If User Submissions infringe, or if
+   you believe that User Submissions infringe any of your rights
+   (including intellectual property rights) or are unlawful, please
+   contact us immediately by following our notice and takedown procedure.
+   Click here to view the Notice and Takedown Procedure. Skype reserves
+   the right to ask for verification of your identity and to seek further
+   information to verify your complaint. You agree that you are solely
+   responsible for the consequences resulting from your complaint
+   (including but not limited to removal or blocking of the User
+   Submission) and you acknowledge and agree that any complaint may be
+   used in court proceedings. Any false, misleading or inaccurate
+   information provided by you may result in civil and criminal liability.
+
+   5.9 Quality: Skype cannot guarantee that the Software, Products or
+   Skype Websites will always function without disruptions, delay or
+   errors. A number of factors may impact the quality of your
+   communications and use of the Software, Products (depending on the
+   Products used) or Skype Websites, and may result in the failure of your
+   communications including but not limited to: your local network,
+   firewall, your internet service provider, the public internet, the
+   public switched telephone network and your power supply. Skype takes no
+   responsibility for any disruption, interruption or delay caused by any
+   failure of or inadequacy in any of these items or any other items over
+   which we have no control.
+
+   5.10 Changes to Products: Skype is constantly improving the Software
+   and Products and may also need to change technical features from time
+   to time in order to comply with applicable regulations. Accordingly,
+   you acknowledge and agree that the Products and functionality of the
+   Software may vary from time to time. Technical requirements for use of
+   Products and Software and feature descriptions are available on the
+   Skype Website. If you do not agree with any changes to Software and
+   Products you may terminate your relationship with Skype in accordance
+   with paragraph 11. You may need to upgrade to a new version in order to
+   enjoy the benefit of certain Products. In addition, you acknowledge and
+   agree that certain Products may be subject to usage limits or
+   geographical restrictions, which may vary from time to time. Please
+   check the Skype Website for details of the most up-to-date usage
+   restrictions that apply to the Products that you are using.
+
+   5.11 Unsolicited Ideas Skype does not consider or accept unsolicited
+   proposals or ideas, including without limitation ideas for new
+   products, technologies, promotions, product names, product feedback and
+   product improvements (“Unsolicited Feedback”). If you send any
+   Unsolicited Feedback to Skype through the Skype Website or otherwise,
+   you acknowledge and agree that Skype shall not be under any obligation
+   of confidentiality with respect to the Unsolicited Feedback.
+
+   5.12 Reports Certain parts of the Skype Websites or the Software may
+   ask for written suggestions or problem reports such as using our
+   contact form or problem report form (“Reports”). Please read carefully
+   any specific terms, which govern those Reports. The Reports shall be
+   deemed the property of Skype. Skype shall exclusively own all now known
+   or hereafter existing rights to the Reports throughout the universe in
+   perpetuity and shall be entitled to use the Reports for any purpose
+   whatsoever, commercial or otherwise, without compensation to the
+   provider of the Reports. Any Reports you send to Skype will not be
+   treated as confidential and Skype shall not be liable for any
+   disclosure of the Reports.
+
+   5.13 Linking You may link to the Skype Website from another website
+   owned by you, provided you do so in a way that is fair and legal and
+   does not damage our reputation or take advantage of it. You must not
+   establish a link in such a way as to suggest any form of association,
+   approval or endorsement by Skype where none exists. You may not frame
+   the Site on any other site. Skype provides a Qik branded embeddable
+   flash player feature which you may incorporate into your own personal,
+   non-commercial website for use in accessing the materials on the Qik
+   branded Skype Website. Skype may revoke the permission to link to the
+   Skype Websites at any time at its sole discretion and will notify you
+   in this respect.
+
+6. YOUR OBLIGATIONS
+
+   6.1 User Account. Prior to your first use of the Skype Software and
+   your first use of the Qik Software, you will be asked to create a User
+   Account and choose a user ID and password. We recommend that you choose
+   a password that is hard to guess and consists of letters, numbers and
+   symbols. You may only use the Software through your User Account. You
+   are solely responsible and liable for all activities conducted through
+   your User Account. To prevent unauthorised use, you shall keep your
+   password confidential and shall not share it with any third party or
+   use it to access third party websites or services. If you suspect that
+   someone else knows your password, then you shall immediately change it
+   in order to protect the security of your User Account. It is your
+   responsibility to ensure that you do not respond to any unsolicited
+   requests for credit card details, passwords or other data. Skype takes
+   no responsibility for your failure to comply with the obligations in
+   this paragraph 6.1.
+
+   6.2 Lawful Use: You must use the Software, Products and Skype Websites
+   in accordance with the laws of where you are located. In some countries
+   there are restrictions on the download and use of the Software,
+   Products and/or Skype Websites. It is your responsibility to ensure
+   that you are legally allowed to use the Software, Products and/or Skype
+   Websites where you are located.
+
+   6.3 Prohibited Use: You may not:
+
+   (a) intercept or monitor, damage or modify any communication which is
+   not intended for you;
+
+   (b) use any type of spider, virus, worm, trojan-horse, time bomb or any
+   other codes or instructions that are designed to distort, delete,
+   damage, emulate or disassemble the Software, Products, Skype Websites,
+   communication or protocols;
+
+   (c) send unsolicited communications (also referred to as “SPAM”, “SPIM”
+   or “SPIT”) or any communication not permitted by applicable law or use
+   the Software, Products or Skype Websites for the purposes of phishing
+   or pharming or impersonating or misrepresenting affiliation with
+   another person or entity;
+
+   (d) expose any third party to material which is offensive, harmful to
+   minors, indecent or otherwise objectionable in any way;
+
+   (e) use the Software, Products or Skype Websites to cause or intend to
+   cause embarrassment or distress to, or to threaten, harass or invade
+   the privacy of, any third party; or
+
+   (f) use (including as part of your User ID and/or profile picture) any
+   material or content that is subject to any third party proprietary
+   rights, unless you have a licence or permission from the owner of such
+   rights; or
+
+   (g) collect or harvest any personally identifiable information,
+   including account names, from the Software, Products or Skype Websites;
+
+   (h) impact or attempt to impact the availability of the Software,
+   Products or Skype Websites for example, with a denial of service (DOS)
+   or distributed denial of service (DDoS) attack;
+
+   (i) use or launch any automated system, including without limitation,
+   robots, spiders or offline readers that access the Software, Products
+   or Skype Websites. Notwithstanding the foregoing, you agree that Skype
+   grants to the operators of public search engines permission to use
+   spiders to copy materials from the Skype Website for the sole purpose
+   of creating publicly available searchable indices of the materials, but
+   not caches or archives of such materials. Skype reserves the right to
+   revoke these exceptions at any time.
+
+   6.4 User Submissions Please exercise respect when participating in any
+   features of the Skype Websites or Software such as Forums, Blogs, email
+   functions, video hosting, sharing and/or publishing or any other
+   function on the Skype Websites or of the Skype Software which allows
+   you to post, upload, edit, host, share and/or publish content. You
+   acknowledge and agree that: (i) by using the Skype Websites and/or
+   Software you may be exposed to content that you may find offensive or
+   indecent and you do so at your own risk; (ii) you are solely
+   responsible for, and Skype has no responsibility to you or any third
+   party for any User Submissions that you create, submit, post or publish
+   on the Skype Websites or through the Software; (iii) Skype does not
+   guarantee any confidentiality with respect to User Submissions, whether
+   or not they are published (iv) Skype is not responsible for any User
+   Submissions that you may have access to through your use of the Skype
+   Websites or Software and all User Submissions are the responsibility of
+   the person from whom such User Submissions originated. Skype does not
+   endorse any User Submissions or any opinion, recommendation, or advice
+   expressed therein, and expressly disclaims any and all liability in
+   connection with User Submissions.
+
+   In connection with your User Submissions, you represent and warrant
+   that you
+
+   (i) own or have the necessary licenses, rights, consents, and
+   permissions to use and authorise Skype to use all copyrights, trade
+   marks, trade secrets, patents and other intellectual property or
+   proprietary rights in and to any and all User Submissions in accordance
+   with these Terms; and
+
+   (ii) you have the written consent, release and /or permission of each
+   and every identifiable individual person in the User Submission to use
+   the name and/or likeness of each and every such individual in the User
+   Submission, to enable inclusion and use thereof in the manner
+   contemplated by these Terms. You shall not copy, post or use text,
+   photos, pictures, music, sounds, images or any other content from any
+   third party or source (“Third Party Content”) without specific
+   permission from the owner. Such Third Party Content may be protected by
+   intellectual property laws and the owners of the intellectual property
+   rights in such content may object to its use. You must not use any
+   Third Party Content without first obtaining the permission of the owner
+   of the intellectual property rights in such content.
+
+   Notwithstanding any rights or obligations governed by the Additional
+   Terms (as defined below) if, at any time you choose to upload or post
+   User Submissions to the Skype Websites or through the Software
+   (excluding Reports and excluding the content of your communications)
+   you automatically grant Skype a non-exclusive, worldwide, irrevocable,
+   royalty-free, perpetual, sub-licensable and transferable license of all
+   rights to use, edit, modify, include, incorporate, adapt, record,
+   publicly perform, display, transmit and reproduce the User Submissions
+   including, without limitation, all trade marks associated therewith, in
+   connection with the Skype Websites and Skype’s Software and Products
+   including for the purpose of promoting or redistributing part or all of
+   the Skype Websites and/or the Software or Products, in any and all
+   media now known or hereafter devised. You also hereby grant each user
+   of the Skype Website and/or Skype’s Software or Products a
+   non-exclusive license to access your User Submission through the Skype
+   Website and/or Software or Products and to use, copy, distribute,
+   prepare derivative works of, display, perform and transmit such User
+   Submissions solely as permitted through the functionality of the Skype
+   Websites and/or Software or Products and pursuant to these Terms of
+   Use. In addition, you waive any so-called “moral rights” in and to the
+   User Submissions, to the extent permitted by applicable law.
+
+   You may not submit or publish through the Skype Website or Software any
+   User Submissions that are libelous, defamatory, pornographic,
+   harassing, hateful, an invasion of privacy, obscene, abusive, illegal,
+   racist, offensive, harmful to a minor or an infringement of any
+   intellectual property rights or a trade secret of a third party, or
+   would otherwise violate the rights of any third party or give rise to
+   civil or criminal liability. Furthermore, you may not submit or publish
+   User Submissions that contain falsehoods or misrepresentations, solicit
+   funds or services, contain advertising, promotional materials, junk
+   mail, spam, chain letters or any form of solicitation, impersonate
+   others or include programs that contain viruses or any other programs
+   designed to impair the functionality of any computer. You agree not to
+   solicit, for commercial purposes, any users of the Skype Website or
+   Software with respect to their User Submissions. You agree not to
+   circumvent, disable or otherwise interfere with the security related
+   features of the Skype Website or Software or features that prevent or
+   restrict the use of any content thereof.
+
+   6.5 Your Information: From time to time, Skype may request information
+   from you for the purpose of supplying the Software or Products to you.
+   You shall ensure that any such information is complete, up-to-date and
+   accurate.
+
+   6.6 No Reselling. The Software and Products are for your individual
+   use. You shall not resell or commercialise the Software and/or Products
+   to any third party.
+
+   6.7 Export Restrictions: The Software may be subject to international
+   rules that govern the export of software. You shall comply with all
+   applicable international and national laws that apply to the Software
+   as well as end-user, end-use, destination restrictions issued by
+   national governments or similar bodies, and restrictions on embargoed
+   nations. In the US the Internet Communications Software is controlled
+   under ECCN 5D992 of the Export Administration Regulations (“EAR”) under
+   Encryption Registration Number (“ERN”) R100351 and thus may not be
+   exported or re exported from the US to or downloaded by any person in
+   any countries controlled for anti terrorism reasons under the EAR,
+   which include Iran, North Korea, Cuba, Syria and Sudan. Moreover, the
+   Internet Communications Software may not be exported or re exported
+   from the US to or downloaded by any person or entity subject to US
+   sanctions regardless of location. See
+   www.bis.doc.gov/ComplianceAndEnforcement/ListsToCheck.htm and EAR Part
+   736. Skype is making the Software available to you for download only on
+   the condition that you certify that you are not such a person or entity
+   and that the download is not otherwise in violation of US export
+   control and sanctions regulations.
+
+7. PROPRIETARY RIGHTS
+
+   7.1 The Software, Products and Skype Websites contain proprietary and
+   confidential information that is protected by intellectual property
+   laws and treaties.
+
+   7.2 The content and compilation of content included on the Skype
+   Websites, (excluding User Submissions) such as sounds, text, graphics,
+   logos, icons, images, audio clips, digital downloads and software, are
+   the property of Skype, its affiliates or licensors and are protected by
+   United States and international copyright laws. Such copyright
+   protected content cannot be reproduced without Skype’s express
+   permission. You may download and make personal, non-commercial use of
+   User Submissions on www.qik.com that are displayed with a “download” or
+   similar link. Skype reserves all rights not expressly granted in the
+   Skype Websites.
+
+   7.3 Skype and/or its licensors retain exclusive ownership of the
+   Software, Products and Skype Websites and all intellectual property
+   therein (whether or not registered and anywhere in the world). You will
+   not take any action to jeopardise, limit or interfere with Skype’s
+   intellectual property rights in the Software, Products and/or Skype
+   Websites.
+
+   7.4 “Skype”, associated trademarks and logos and the “S” logo are
+   trademarks of Skype. Skype has registered and filed applications to
+   register its trademarks in many countries worldwide. Skype’s trademarks
+   and trade dress may not be used in connection with any product or
+   service that is not Skype’s, in any manner that is likely to cause
+   confusion among customers, or in any manner that disparages or
+   discredits Skype. All other trademarks not owned by Skype or any of its
+   related companies that appear on this site are the property of their
+   respective owners. You are not permitted to and shall not register or
+   use any trade name, trademark, logo, domain name or any other name or
+   sign that incorporates any of Skype’s intellectual property (in whole
+   or part) or that is confusingly similar thereto. Please also see
+   Skype’s Trademark Guidelines for further details on use of its marks.
+
+8. CHARGES
+
+   8.1 Calling phones and premium rate numbers with Skype Credit:
+
+   (i) Calling landlines and mobiles: The charges payable for calling
+   phones (outside of a subscription) consist of a connection fee (charged
+   once, per call) and a per-minute rate as set out on
+   www.skype.com/go/allrates. All calls will be disconnected and require a
+   re-dial after a 4-hour duration and an additional connection fee will
+   be charged on re-dial.
+
+   (ii) Premium rate numbers: The charges payable for calling premium rate
+   numbers consist of a per-minute rate available at
+   www.skype.com/go/rates-premium. No connection fee is payable.
+
+   (iii) Skype may change the rates for calling phones and premium rate
+   numbers at any time without notice to you by posting such change at
+   www.skype.com/go/allrates. The new rate will apply to your next
+   purchase after the new rates have been published. Please check the
+   latest rates before you make your call. If you do not accept the new
+   rates, do not make your call.
+
+   (iv) The duration of a call shall be based on one-minute increments.
+   Fractions of minutes will be rounded up to the next minute. The
+   connection fee, where applicable, will be charged at the beginning of
+   the call. At the end of a call, fractional cent charges will be rounded
+   up to the nearest whole cent, for example a total call price of €0.034
+   will be rounded up to €0.04. During the call, charges incurred will be
+   deducted automatically from the Skype Credit balance in your User
+   Account.
+
+   8.2 Charges for other Paid For Products: The charges for other Paid For
+   Products will be confirmed to you before you complete a purchase from
+   Skype. Skype may change the charges payable for the purchase of such
+   Products at any time without any notice to you. You can choose whether
+   or not to accept the new charges prior to completing your next purchase
+   of the applicable Product. The new charges will apply to your next
+   purchase after the new charges have been published.
+
+   8.3 Promotional Offers: From time to time, Skype may offer Paid-For
+   Products for free for a trial period. Skype reserves the right to
+   charge you for such Products (at the normal rate) in the event that
+   Skype determines (in its reasonable discretion) that you are abusing
+   the terms of the offer, including if you are using any service, proxy
+   or other devices or anonymous IP address that prevents us from locating
+   you.
+
+   8.4 Tax: Skype may collect VAT or other indirect taxes at the
+   appropriate rate (as per applicable tax rules) at the time of purchase
+   of Skype Credit. 15% Luxembourg VAT generally applies if you are
+   located in the EU and the Products are purchased and used in the EU. 8%
+   Swiss VAT applies if you are located in Switzerland. Other local taxes
+   may apply in certain countries. When you purchase a voucher or pre-paid
+   card, depending on the country, 15% Luxembourg VAT, local VAT or other
+   taxes may apply and may be deducted from the value of the voucher or
+   prepaid card upon redemption. You explicitly waive any right to VAT
+   reimbursement from Skype if the amount of VAT ultimately payable by the
+   latter to the tax authorities would for any reason be lower than the
+   amount of VAT collected from you at the time of purchase. Your Skype
+   Credit balance is displayed exclusive of any such taxes. The
+   territories in the EU set out below are outside the scope of EU VAT
+   under Council Directive 2006/112/EC on the common system of VAT, as
+   amended. The Skype Website does not enable users in such territories to
+   take advantage of this VAT exemption and we therefore do not provide
+   the Products in such territories: Mount Athos, Canary Islands, French
+   Overseas Departments, Aland Islands, Channel Islands, Heligoland
+   Island, Büsingen / Buesingen Territory, Ceuta, Melilla, Livigno,
+   Campione d'Italia and Italian Waters of Lake Lugano.
+
+   8.5 Third-Party Charges: Using the Software on mobile applications will
+   use some of the data allowance available on the data package to which
+   you have subscribed with your mobile network operator. Out-of-country
+   usage may lead to significantly higher costs than regular usage, and
+   you are solely responsible for keeping yourself informed and paying for
+   possible roaming and other applicable charges levied by your mobile
+   network operator.
+
+9. PAYMENT
+
+   9.1 Skype Credit. You can pay for select Paid-For Products using Skype
+   Credit. You can purchase Skype Credit using any payment method made
+   available to you by Skype from time to time. The Skype Credit that you
+   purchase will be credited to your User Account at the time of purchase
+   (or if you are using a Skype Credit voucher, at the time you redeem
+   that voucher).
+
+   9.2 Inactive Skype Credit. If you do not use your Skype Credit for a
+   period of 180 days, (including Skype Credit that has been allocated to
+   you by a Skype Manager administrator) Skype will place your Skype
+   Credit on inactive status. You can reactivate the Skype Credit by
+   following the reactivation link in My Account at
+   https://secure.skype.com/account/credit-reactivate. Reactivated Skype
+   Credit is not refundable. If you are located in Japan and you buy Skype
+   Credit from the Skype Website, this paragraph does not apply to you and
+   your Skype Credit shall expire 6 months from the date of purchase. You
+   are not permitted to use any Skype Credit on or after the date of its
+   expiry.
+
+   9.3 Other payment methods. Skype does not guarantee that you will be
+   able to use your Skype Credit balance to purchase all Products. Where
+   Skype Credit cannot be used to pay for a Product, Skype will make
+   another payment method available to you. Skype reserves the right to
+   remove or amend the available payment methods at its sole discretion.
+
+   9.4 Recurring Payments. Where you purchase Products on a subscription
+   basis (monthly, every 3 months or annually (as applicable)), you
+   acknowledge and agree that this is a recurring payment and payments
+   shall be made to Skype by the method you have chosen at the recurring
+   intervals chosen by you, until the subscription for that Product is
+   terminated by you or by Skype.
+
+   9.5 Auto-Recharge.
+
+   (a) The Auto-Recharge feature will be automatically enabled when you
+   buy Skype Credit, unless you untick the appropriate box. Your Skype
+   Credit balance will be recharged with the same amount and by the same
+   payment method chosen when you first sign up for Auto-Recharge, unless
+   you subsequently change the amount by accessing your User Account. For
+   example, if you purchase 10 Euros of Skype Credit with your credit
+   card, the recharge amount charged to your credit card will also be 10
+   Euros of Skype Credit. In future the same amount will be charged to
+   your credit card every time your Skype account balance goes below the
+   threshold set by Skype from time to time. If you do not want to enable
+   Auto-Recharge, please untick the box.
+
+   (b) If you purchased a subscription with a payment method other than
+   credit card, PayPal or Moneybookers (Skrill), and you have enabled
+   Auto-Recharge, your Skype Credit balance will be recharged with the
+   amount necessary to purchase your next recurring subscription.
+
+   (c) You can disable Auto-Recharge at any time by accessing your User
+   Account.
+
+10. REFUND POLICY
+
+   10.1 When you purchase Paid-For-Products directly from Skype you will
+   be entitled to a cancellation period of fifteen (15) days (a
+   “Cooling-Off Period”) unless you have made use of the Paid-For-Products
+   in any way, in which case the Cooling-Off Period will be extinguished
+   and your purchase cannot be cancelled or refunded.
+
+   10.2 Outside of the Cooling-Off Period, only subscriptions are
+   refundable unless used or expired.
+
+   10.3 Expenditure of Skype Credit, allocation of a Skype Number, or use
+   of any aspect of a subscription amounts to “use” of a Paid-For-Product.
+   You hereby expressly agree that Skype Numbers may be allocated before
+   the end of the Cooling-Off Period.
+
+   10.4 The Cooling-Off Period and refunds do not apply to
+   Paid-For-Products that are (i) purchased via a third party partner of
+   Skype (please contact the partner directly, who may decide in its sole
+   discretion whether or not to pay a refund), (ii) not directly acquired
+   online from Skype (e.g. vouchers or pre-paid cards) (iii) paid for in
+   cash using third party payment methods (such as a cash payment wallet)
+   and (iv) paid for and allocated to your Skype Account by a Skype
+   Manager administrator. They also do not apply to Membership of Skype
+   Developer.
+
+   10.5 If you believe that Skype has charged you in error, you must
+   contact Skype within 90 days of such charge. No refunds will be given
+   for any charges more than 90 days old.
+
+   10.6 Skype reserves the right to refuse a refund request if it
+   reasonably believes (i) that you are trying to unfairly exploit this
+   refund policy, for example, by making repetitive refund requests in
+   respect of the same Product; (ii) if you are in breach of these Terms
+   or (iii) if Skype reasonably suspects that you are using our Products
+   or Software fraudulently or that your User Account is being used by a
+   third party fraudulently.
+
+   10.7 This refund policy does not affect your statutory rights.
+
+11. ENDING YOUR RELATIONSHIP WITH SKYPE
+
+   11.1 You may terminate your relationship with Skype at any time and
+   without recourse to the courts by requesting closure of your User
+   Account, ceasing to use the Software, Products and/or Skype Websites
+   and cancelling any recurring payments.
+
+   11.2 Skype may terminate its relationship with you, or may terminate or
+   suspend your use of the Software, User Account(s), Products or Skype
+   Websites at any time and without recourse to the courts:
+
+   (a) if you are in breach of these Terms;
+
+   (b) if Skype reasonably suspects that you are using the Software, the
+   Products and/or Skype Websites to break the law or infringe third party
+   rights;
+
+   (c) if Skype reasonably suspects that you are trying to unfairly
+   exploit or misuse the refund policy, or any of our policies.
+
+   (d) if Skype reasonably suspects that you are using our Products,
+   Software and/or Skype Websites fraudulently or that your User Account
+   is being used by a third party fraudulently;
+
+   (e) if you have purchased Skype Credit from an unauthorised reseller;
+
+   (f) in respect of a particular Product, on thirty (30) days notice if
+   Skype decides to cease offering that Product;
+
+   (g) immediately, if required due to a change in laws/regulation by a
+   regulator or authority with a lawful mandate, or by any of Skype’s
+   partners;
+
+   (h) on thirty (30) days notice if Skype decides to cease offering the
+   Software to users in your jurisdiction generally.
+
+   11.3 Skype shall effect such termination by preventing your access to
+   your User Account, the Software, Products and/or Skype Websites (as
+   applicable). We reserve the right to cancel User Accounts that have
+   been inactive for more than one (1) year.
+
+   11.4 Consequences of Termination: Upon termination of your relationship
+   with Skype: (a) all licenses and rights to use the Software, Products
+   and/or Skype Websites shall immediately terminate; (b) you will
+   immediately cease any and all use of the Software, Products and/or
+   Skype Websites; and (c) you will immediately remove the Software from
+   all hard drives, networks and other storage media and destroy all
+   copies of the Software in your possession or under your control.
+
+12. EXCLUSION OF WARRANTIES, LIMITATION OF LIABILITY AND INDEMNITY
+
+   12.1 For the purposes of this paragraph 12, "Skype" includes its
+   subsidiary companies and affiliated legal entities and all their
+   directors, officers, agents, licensors and employees.
+
+   12.2 No Warranties: TO THE MAXIMUM EXTENT PERMITTED BY LAW: THE
+   SOFTWARE, PRODUCTS AND SKYPE WEBSITES ARE PROVIDED “AS IS” AND USED AT
+   YOUR SOLE RISK WITH NO WARRANTIES WHATSOEVER; SKYPE DOES NOT MAKE ANY
+   WARRANTIES, CLAIMS OR REPRESENTATIONS AND EXPRESSLY DISCLAIMS ALL SUCH
+   WARRANTIES OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, WITH
+   RESPECT TO THE SOFTWARE, PRODUCTS AND/OR SKYPE WEBSITES INCLUDING,
+   WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF QUALITY, PERFORMANCE,
+   NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR USE FOR A PARTICULAR
+   PURPOSE. SKYPE FURTHER DOES NOT REPRESENT OR WARRANT THAT THE SOFTWARE,
+   PRODUCTS AND/OR SKYPE WEBSITES WILL ALWAYS BE AVAILABLE, ACCESSIBLE,
+   UNINTERRUPTED, TIMELY, SECURE, ACCURATE, COMPLETE AND ERROR-FREE OR
+   WILL OPERATE WITHOUT PACKET LOSS, NOR DOES SKYPE WARRANT ANY CONNECTION
+   TO OR TRANSMISSION FROM THE INTERNET, OR ANY QUALITY OF CALLS MADE
+   THROUGH THE SOFTWARE.
+
+   12.3 Nothing in these Terms shall exclude or restrict Skype's liability
+   for (a) death or personal injury, (b) loss resulting from Skype's
+   wilful default or gross negligence, (c) fraud or deliberate
+   misrepresentation, or (d) any liability which cannot be limited or
+   excluded by applicable law.
+
+   12.4 No Liability: YOU ACKNOWLEDGE AND AGREE THAT SKYPE WILL HAVE NO
+   LIABILITY WHATSOEVER, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE)
+   OR ANY OTHER THEORY OF LIABILITY, AND WHETHER OR NOT THE POSSIBILITY OF
+   SUCH DAMAGES OR LOSSES HAS BEEN NOTIFIED TO SKYPE, IN CONNECTION WITH
+   OR ARISING FROM YOUR USE OF SKYPE WEBSITES, OR THE INTERNET
+   COMMUNICATIONS SOFTWARE OR OTHER SOFTWARE THAT IS PROVIDED FREE OF
+   CHARGE. YOUR ONLY RIGHT OR REMEDY WITH RESPECT TO ANY PROBLEMS OR
+   DISSATISFACTION WITH SUCH SOFTWARE AND/OR SKYPE WEBSITES IS TO
+   IMMEDIATELY DEINSTALL SUCH SOFTWARE AND CEASE USE OF SUCH SOFTWARE
+   AND/OR SKYPE WEBSITES.
+
+   12.5 Limitation of Liability: Subject to paragraphs 12.3 and 12.4
+   above, Skype shall not be liable to you, whether in contract, tort
+   (including negligence) or any other theory of liability, and whether or
+   not the possibility of such damages or losses has been notified to
+   Skype, for:
+
+   (a) any indirect, special, incidental or consequential damages; or
+
+   (b) any loss of income, business, actual or anticipated profits,
+   opportunity, goodwill or reputation (whether direct or indirect); or
+
+   (c) any damage to or corruption of data (whether direct or indirect);
+
+   (d) any claim, damage or loss (whether direct or indirect ) arising
+   from or relating to:
+
+   (i) your inability to use the Software to contact Emergency Services;
+
+   (ii) your failure to make additional arrangements to access Emergency
+   Services in accordance with paragraph 5.5 above;
+
+   (iii)the service limitations set out in paragraph 5.6;
+
+   (iv)your failure to provide accurate physical location information to
+   an Emergency Services operative; or
+
+   (v)conduct of third party Emergency Services operatives and calling
+   centres to which you may be connected.
+
+   (e) any claim, damage or loss (whether direct or indirect) arising from
+   or relating to:
+
+   (i) any product or service provided by a third party under their own
+   terms of service, including without limitation, Skype WiFi;
+
+   (ii) any Third Party Technology;
+
+   (iii) any third party website.
+
+   12.6 Subject to paragraphs 12.3 - 12.5 above, Skype’s total liability
+   to you under or in connection with these Terms (whether in contract,
+   tort (including negligence) or any other theory of liability)) SHALL
+   NOT EXCEED IN AGGREGATE THE AMOUNT PAID BY YOU FOR THE PRODUCTS IN THE
+   12 MONTH PERIOD IMMEDIATELY PRIOR TO THE DATE OF THE EVENT GIVING RISE
+   TO THE RELEVANT CLAIM, SUBJECT TO A MAXIMUM OF FIVE THOUSAND EUROS IN
+   ALL CASES.
+
+   12.7 If any third party brings a claim against Skype in connection
+   with, or arising out of (i) your breach of these Terms; (ii) your
+   breach of any applicable law of regulation; (iii) your infringement or
+   violation of the rights of any third parties (including intellectual
+   property rights); (iv) your User Submissions or (v) your complaint in
+   relation to any User Submission, you will indemnify and hold Skype
+   harmless from and against all damages, liability, loss, costs and
+   expenses (including reasonable legal fees and costs) related to such
+   claim.
+
+13. THIRD-PARTY WEBSITES, PRODUCTS AND SERVICES
+
+   13.1 Third parties may offer products or services via the Software
+   and/or Skype Websites, including games, applications, images, ring
+   tones, or avatars. Whilst Skype takes no responsibility for such
+   products or services, if you encounter any problems with payment for or
+   download, use of installation of such products or services, Skype will
+   use commercially reasonable endeavours to assist or resolve the
+   problems. The third party products or services may be subject to the
+   third party provider’s own terms and privacy policy that you may have
+   to accept upon download or installation. You should review such terms
+   before making any purchase or using any third party product or service
+   and Skype shall not be responsible for your failure to do so.
+
+   13.2 You acknowledge and agree that any third-party product information
+   and pricing that is shown on the Skype Websites regarding third-party
+   products and services is given to Skype by the applicable third-party
+   merchant (“Merchant”). The Merchant has the ability to change its
+   pricing or terminate its product availability at anytime. Skype is not
+   involved in any transactions between you and any Merchant whose
+   products and/or services are listed on the Skype Websites. Skype does
+   not control, is not responsible for and does not guarantee: (i) the
+   pricing, quality, performance, availability or terms and conditions of
+   purchase of products or services provided by the Merchant; (ii) any
+   payment transactions, delivery, returns or after sales activities
+   related to the products or services purchased on the Merchants’
+   websites; (iii) the availability of the Merchant’s websites; (iv) the
+   completeness, truth or accuracy of any advertising or other materials
+   on, or available from, the Merchants’ websites, nor any listing or
+   other content about such products and services displayed on the Skype
+   Websites; (v) links to the Merchants’ websites that are featured on the
+   Skype Websites. Any questions, complaints, or claims related to any
+   product or service provided by a Merchant should be directed to the
+   applicable Merchant.
+
+   13.3 The Software and Skype Websites may include hyperlinks to other
+   third party websites. Skype is not responsible for such third party
+   websites or the availability of such websites and does not endorse any
+   content or material on such third party websites. Your use of each of
+   these third party websites is subject to the terms and conditions
+   posted on the applicable website.
+
+14. ADDITIONAL TERMS
+
+   14.1 The Skype Etiquette provides guidelines on how to use Skype and
+   how to treat the other members of Skype’s community properly and
+   respectfully. Please read these guidelines carefully which form part of
+   the Terms.
+
+   14.2 If you want to use the Internet Communications Software in
+   connection with any Broadcast, you must comply with the Broadcast TOS
+   at http://www.skype.com/legal/broadcast
+
+   14.3 Software Development Kits and APIs. Software development kits
+   provided through Skype Developer on the Skype Website (including
+   “SkypeKit”) and the use of any application program interface (“API”)
+   exposed or made available by Skype are subject to their own licensing
+   terms in which case such licensing terms will govern your use of that
+   software. If you use any such software development kit or API (as
+   applicable) you agree that you have read and will comply with the
+   applicable licensing terms, which are available on
+   http://developer.skype.com/.
+
+   14.4 Qik Free and Open Source Software Notice is incorporated herein by
+   reference.
+
+15. YOUR CONFIDENTIAL INFORMATION AND YOUR PRIVACY
+
+   Skype is committed to respecting your privacy and the confidentiality
+   of your personal information. We will process your personal
+   information, the traffic data and the content of your communication(s)
+   in accordance with our Privacy Policy: http://www.skype.com/go/privacy.
+
+16. FOR GOVERNMENT USERS ONLY
+
+   The Software and Documentation are “commercial computer software” and
+   “commercial computer software documentation,” respectively, as such
+   terms are used in United States Federal Acquisition Regulations
+   paragraph 12.212. Any use, duplication or disclosure of the Software or
+   the Documentation by or on behalf of the U.S. Government is subject to
+   restrictions as set forth in this Agreement.
+
+17. HOW TO CONTACT SKYPE
+
+   17.1 To contact Skype in relation to the Skype Software or “Skype”
+   branded Products, please submit a support request to support.skype.com.
+
+   17.2 To contact Skype in relation to the Qik Software or “Qik” branded
+   Products, please submit a support request to support.qik.com.
+
+   17.3 If you contact Skype by any means other than as set out in
+   paragraphs 17.1 or 17.2, your request may not be acknowledged.
+
+18. MISCELLANEOUS
+
+   18.1 You agree to the use of electronic communication in order to enter
+   into contracts, place orders, and create other records and to the
+   electronic delivery of notices, policies and changes thereto and
+   records of transactions with Skype.
+
+   18.2 For your convenience, Skype may provide you with a translation of
+   the English language version of these Terms. In the event of any
+   inconsistency between a non-English version of these Terms and the
+   English version, the English version shall govern your relationship
+   with Skype.
+
+   18.3 These Terms constitute the entire agreement between you and Skype
+   with respect to your use of the Software, Products and/or Skype
+   Websites and replace any prior agreements between you and Skype with
+   respect to the Software, Products and/or Skype Websites.
+
+   18.4 If any provision of these Terms (or part of it), is found by any
+   court or administrative body of competent jurisdiction or an arbitrator
+   to be illegal, invalid or unenforceable, then such provision (or part
+   of it) shall be removed from the Terms without affecting the legality,
+   validity or enforceability of the remainder of the Terms. Paragraph
+   20.3(i) says what happens if parts of paragraph 20.3 (arbitration and
+   class action waiver) are found to be illegal, invalid or unenforceable.
+   Paragraph 20.3(i) prevails over this paragraph if inconsistent with it.
+
+   18.5 The failure by Skype to exercise, or delay in exercising, a legal
+   right or remedy provided by these Terms or by law shall not constitute
+   a waiver of Skype’s right or remedy. If Skype waives a breach of these
+   Terms, this shall not operate as a waiver of a subsequent breach of the
+   Terms.
+
+   18.6 You may not assign these Terms or any rights or obligations
+   contained in them. Skype may, without prior notice, assign these Terms
+   or any rights or obligations contained in them to any third party.
+
+   18.7 This paragraph 18, along with paragraphs, 4.2, 12, 20.3 and any
+   other provisions, which are expressed or clearly intended to survive or
+   operate in the event of termination, shall survive termination of the
+   Terms.
+
+   18.8 You acknowledge and agree that if Skype is unable to provide the
+   Software, Products and/or Skype Websites as a result of a force majeure
+   event, Skype will not be in breach of any of its obligations towards
+   you under these Terms. A force majeure event means any event beyond the
+   control of Skype.
+
+   18.9 These Terms other than paragraph 20.3 shall be governed by and
+   interpreted in accordance with the laws of Luxembourg and shall be
+   subject to the jurisdiction of the courts of the district of
+   Luxembourg. Paragraph 20.3 is governed by the United States Federal
+   Arbitration Act.
+
+   18.10 AVC/H.264 NOTICE: If the Software is used to make video calls (i)
+   between a personal computer and a device that is not a personal
+   computer or (ii) between devices that are not personal computers, the
+   AVC/H.264 codec may be used to facilitate video functionality in which
+   case the following notice applies: THE AVC VIDEO FUNCTIONALITY IN THIS
+   PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE
+   PERSONAL AND NON-COMMERCIAL USE OF A CONSUMER TO (i) ENCODE VIDEO IN
+   COMPLIANCE WITH THE AVC STANDARD (“AVC VIDEO”) AND/OR (ii) DECODE AVC
+   VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND
+   NON-COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER
+   LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE
+   IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM
+   MPEG LA, L.L.C. SEE www.mpegla.com.
+
+19. PRODUCT SPECIFIC TERMS
+
+   19.1 Skype Numbers (previously known as “Online Numbers”) and Skype To
+   Go numbers
+
+   (a) Availability and use. Where we provide you with a Skype Number or
+   Skype To Go number, you agree that:
+
+   (i) you do not own the number or have a right to retain that number
+   forever;
+
+   (ii) the number provided to you is subject to applicable numbering
+   rules and regulatory practices;
+
+   (iii) you will comply on an ongoing basis with any specific number
+   allocation requirements that we make you aware of, or any reasonable
+   instructions that Skype or Skype’s partners may give to you with regard
+   to the use of the numbers and the Products;
+
+   (iv) you will not transfer or attempt to transfer your number to any
+   third party. In particular, you are responsible for compliance with any
+   requirements related to residency and or location; and
+
+   (v) you will supply accurate, complete and up-to-date information to us
+   where we request it and inform us where such information changes. Skype
+   reserves the right to change the terms related to Skype Numbers and/or
+   Skype To Go numbers, including without limitation to impose or amend
+   any residency requirements and/or require the provision of further user
+   information for continued access to such numbers. In certain countries,
+   a number may be made available to you by a Skype partner rather than
+   Skype, and you may need to enter into a separate agreement with such
+   partner.
+
+   (b) Other changes to numbers. If Skype needs to withdraw or change the
+   number that has been made available to you, Skype will use commercially
+   reasonable endeavours to notify you by e-mail, stating the effective
+   date of the change and where possible, your new number. If you do not
+   wish to accept this new number, you are entitled to terminate your
+   number.
+
+   19.2 User Account on Skype Manager
+
+   (a) You are not permitted to belong to more than one Skype Manager at
+   the same time.
+
+   (b) Any Skype Number purchased before 21 July 2009 and allocated to you
+   by a Skype Manager administrator shall be taken back by the
+   administrator of the Skype Manager, if you leave the Skype Manager
+   account for any reason. The right to use the number and the
+   cancellation of such right rest with the Skype Manager administrator at
+   his/her sole discretion and not you.
+
+   (c) Personal and traffic data – Members. As a member of a Skype Manager
+   account you acknowledge and agree that the administrator of the Skype
+   Manager may, if you agree, view detailed information about the activity
+   on your User Account including the time, date, duration and destination
+   number of calls and SMS made and details of your purchases and
+   downloads. You can withdraw your agreement at any time by changing the
+   settings on your User Account. If you provide personal data including
+   your name and job title to be included on the Skype Manager directory,
+   you acknowledge that other members of that Skype Manager may view such
+   data.
+
+   19.3 Subscriptions
+
+   (a) Fair Usage Policy. At Skype, we want all of our customers to get
+   the best calling plans, known as ‘subscriptions’, at the lowest
+   possible price. This Fair Usage Policy ("FUP") is designed to prevent
+   fraud and abuse of our subscriptions by a small number of users.
+
+   Subject to this FUP, Skype’s unlimited subscriptions allow unlimited
+   calls to landlines in the applicable subscription countries (excluding
+   special, premium, service and non-geographic numbers). Unlimited calls
+   to mobiles may also be included where stated at the time of purchase.
+   All calls will be disconnected and require a re-dial after a 2-hour
+   duration.
+
+   Skype’s subscriptions are for individual use only (personal or business
+   communications) in accordance with our Terms of Use and this FUP
+   (“Legitimate Use”). The following is a non-exhaustive list of practices
+   that would not be considered Legitimate Use:
+
+   (i) Using subscriptions for telemarketing or call centre operations;
+
+   (ii) Re-selling subscription minutes;
+
+   (iii) Sharing subscriptions between users whether via a PBX, call
+   centre, computer or any other means;
+
+   (iv) Calling numbers (whether singly, sequentially or automatically) to
+   generate income for yourself or others as a result of merely placing
+   the call, other than for your individual business communications (and
+   subject to paragraph 4.1 of the Terms of Use); and
+
+   (v) Unusual calling patterns inconsistent with normal, individual
+   subscription use, for example, regular calls of short duration or calls
+   to multiple numbers in a short period of time.
+
+   Other practices may be relevant in determining Legitimate Use and Skype
+   reserves the right to take any unlawful, prohibited, abnormal or
+   unusual activity into account in making its determination. Skype may at
+   its option, terminate its relationship with you, or may suspend your
+   subscription immediately if it determines you are using your
+   subscription contrary to this FUP or Skype’s Terms of Use. Where
+   reasonable, Skype will provide you with notice of improper usage before
+   suspension or termination of your subscription and, if appropriate,
+   Skype may offer you an alternative subscription.
+
+   (b) Skype reserves the right to withdraw or change the subscriptions at
+   any time. If Skype changes the Products included in your subscription,
+   Skype will notify you by email stating the changes and their effective
+   date. If you do not wish to accept these changes, you are entitled to
+   terminate your subscription, with effect from the date on which the
+   changes are due to take effect.
+
+   (c) The “Unlimited World Extra” subscription has a minimum fixed term
+   of 2 years from the date of purchase. You are not permitted to
+   terminate it before the expiry of the 2-year minimum term except in
+   case of breach by Skype of the Terms. This subscription is billed
+   monthly as a recurring payment.
+
+   19.4 Skype WiFi
+
+   Skype WiFi is provided by one of Skype’s WiFi partners. Your use of
+   Skype WiFi is subject to that partner’s terms of service. Before you
+   start a Skype WiFi session at a specific WiFi hotspot, you will be
+   notified of the identity of the WiFi provider and their terms of
+   service. You will have to read their terms of service, which you agree
+   to be subject to by proceeding with the Skype WiFi session. You can pay
+   for Skype WiFi using your Skype Credit balance, and your use of Skype
+   Credit is subject to these Terms of Service.
+
+   19.5 SMS
+
+   Each SMS message has a limit of 160 characters. If you type a longer
+   message it will be broken down into several SMS messages and you will
+   be charged for each message sent. If you send SMS messages to more than
+   one person you will be charged for each SMS sent to each recipient. If
+   Skype cannot (for whatever reason) send your SMS, Skype will continue
+   to try and send the message for up to 24 hours after which time the SMS
+   charge will be refunded to your Skype Credit balance automatically if
+   delivery is unsuccessful.
+
+   19.6 Group Video Calling
+
+   (a) A fair usage policy applies at www.skype.com/go/terms.gvc.fairusage
+   and is incorporated herein by reference. Skype reserves the right to
+   change the fair usage policy at any time. Changes shall become
+   effective when published on the Skype Website. Your continued use of a
+   Skype Premium Subscription after publication on the Skype Website shall
+   constitute your acceptance to be bound by the terms and conditions of
+   the revised fair usage policy.
+
+   (b) Number of Participants. The number of permitted participants on a
+   group video call varies from 3 to a maximum of 10, subject to system
+   requirements. You can find more details at
+   www.skype.com/go/skypepremium.
+
+   (c) Audio Conversion. If a Skype Premium Subscription or Day Pass
+   expires during a group video call, or it has exceeded the fair usage
+   limit, or the owner of the Skype Premium Subscription leaves the call
+   (and there is no other participant on the call who owns a Skype Premium
+   Subscription), then the call will convert from video to audio.
+
+   (d) Software Versions. If a participant of a group video call is not on
+   a version of Internet Communications Software that supports group video
+   calls, then the call will be an audio call only for that participant.
+   For details of the system requirements for group video calling, please
+   see www.skype.com/go/skypepremium.requirements.
+
+   (e) Live chat. Live chat customer support is available as part of the
+   Skype Premium Subscription. This support is available 24 hours a day,
+   every day, and only in English.
+
+   19.7 Qik Premium Fair Usage Policy
+
+   Qik Premium is subject to a fair usage policy of 15GB of video storage
+   per user per month and each video can be no more than 90 minutes in
+   duration. Once these limits have been reached you cannot upload any new
+   videos in that month or continue recording beyond the 90-minute mark.
+
+   Skype reserves the right to change the fair usage policy at any time.
+   Changes shall become effective when published on the Skype Website.
+   Your continued use of Qik Premium after publication on the Skype
+   Website shall constitute your acceptance to be bound by the terms and
+   conditions of the revised fair usage policy.
+
+   19.8 Skype Video Messaging (“Video Messaging”)
+
+   If you are not a Skype Premium subscriber, the number of Video Messages
+   you can send are limited and will be subject to an expiry date.
+
+   Fair Use Policy: This FUP is designed to prevent fraud and abuse of
+   Video Messaging. Video Messaging is for personal, individual and
+   non-commercial use only, and to be in accordance with these Terms at
+   all times (“Legitimate Use”). Skype reserves the right to take any
+   unlawful, prohibited, abnormal or unusual activity into account in
+   making its determination as to whether your activity does not
+   constitute Legitimate Use. Skype may in its option, terminate its
+   relationship with you, or suspend your account immediately if it
+   determines you are using Video Messaging contrary to this FUP or these
+   Terms.
+
+20. PAY BY MOBILE
+
+   20.1 This section applies if you select a third-party payment system
+   that enables you to pay for Skype Credit and certain Paid for Products
+   via your mobile phone bill where applicable (“Pay by Mobile”).
+
+   20.2 By selecting or using Pay by Mobile:
+
+   (a) You authorise your mobile phone carrier to charge appropriate fees
+   directly to your mobile phone bill; and
+
+   (b) You represent that you are the person or entity responsible for the
+   mobile phone account associated with the mobile number you provide when
+   using Pay by Mobile, or are authorised by that person or entity to
+   incur such charges.
+
+   20.3 BINDING ARBITRATION AND CLASS ACTION WAIVER FOR UNITED STATES
+   ACCOUNTS. If you select Pay by Mobile and your mobile phone account is
+   registered with a mobile phone carrier in the USA or you reside in the
+   USA, the following additional terms apply:
+
+   (a) Paragraph 20.3 applies to any dispute arising between you and
+   either Skype or any third party including mobile phone carriers and
+   Skype’s corporate affiliates (collectively, “Disputed Party” or
+   “Disputed Parties”) relating to your use of Pay by Mobile, EXCEPT IT
+   DOES NOT INCLUDE A DISPUTE RELATING TO THE ENFORCEMENT OR VALIDITY OF
+   YOUR, SKYPE’S, OR EITHER OF OUR LICENSORS’ INTELLECTUAL PROPERTY
+   RIGHTS. Dispute, for purposes of paragraph 20.3, means any dispute,
+   action, or other controversy whether in contract, warranty, tort,
+   statute, regulation, ordinance, or any other legal or equitable basis.
+   Dispute will be given the broadest possible meaning allowable under
+   law.
+
+   (b) In the event of a dispute, you must provide Skype or other Disputed
+   Party with a Notice of Dispute, which is a written statement of the
+   name, address and contact information of the party giving it, the facts
+   giving rise to the dispute, and the relief requested. You must send any
+   Notice of Dispute to Skype or its corporate affiliate at ATTN: Legal
+   Department, Microsoft Corporation One Microsoft Way Redmond, WA
+   98052-7329. and to any other Disputed Party at its principal place of
+   business in the USA, marked ATTN: Legal Department. The Disputed Party
+   will send any Notice of Dispute to your address if it has it, or
+   otherwise to your e-mail address on file. You and the Disputed Party
+   will attempt to resolve any dispute through informal negotiation within
+   60 days from the date the Notice of Dispute is sent, after which you or
+   the Disputed Party may commence arbitration.
+
+   (c) You may also litigate any dispute in a small claims court in your
+   county of residence, if the dispute meets all requirements to be heard
+   in the small claims court. You may litigate in a small claims court
+   whether or not you negotiated informally first.
+
+   (d) Binding Arbitration. If you and a Disputed Party do not resolve any
+   dispute by informal negotiation or in small claims court, any other
+   effort to resolve the dispute will be conducted exclusively by binding
+   arbitration governed by the United States Federal Arbitration Act
+   (“FAA”). You are giving up the right to litigate (or participate in as
+   a party or class member) all disputes in court before a judge or jury.
+   Instead, all disputes will be resolved before a neutral arbitrator,
+   whose decision will be final except for a limited right of appeal under
+   the FAA. Any court with jurisdiction over the parties may enforce the
+   arbitrator’s award.
+
+   (e) Class Action Waiver. Any proceedings to resolve or litigate any
+   dispute in any forum will be conducted solely on an individual basis.
+   Neither you nor a Disputed Party will seek to have any dispute heard as
+   a class action, private attorney general action, or in any other
+   proceeding in which either party acts or proposes to act in a
+   representative capacity. No arbitration or proceeding will be combined
+   with another without the prior written consent of all parties to all
+   affected arbitrations or proceedings.
+
+   (f) Any arbitration will be conducted by the American Arbitration
+   Association (the “AAA”) under its Commercial Arbitration Rules. If you
+   are an individual and use the Software or Products for personal or
+   household use, or if the value of the dispute is $75,000 USD or less
+   whether or not you are an individual or how you use them, its
+   Supplementary Procedures for Consumer-Related Disputes will also apply.
+   For more information, see adr.org or call +1-800-778-7879. In a dispute
+   involving $75,000 USD or less, Skype will promptly reimburse your
+   filing fees and pay the AAA’s and arbitrator’s fees. You and Skype
+   agree to the terms governing procedures, fees and incentives at
+   go.microsoft.com/fwlink/?linkid=275219.  To commence arbitration,
+   submit the form available at go.microsoft.com/fwlink/?linkid=275627 to
+   the AAA. You agree to commence arbitration only in your county of
+   residence, in Santa Clara County, California, or another Disputed
+   Party’s principal place of business in the USA. Skype and other
+   Disputed Parties agree to commence arbitration only in your county of
+   residence.
+
+   (g) To the extent permitted by law, any claim or dispute relating to
+   your use of Pay by Mobile must be filed within one year in small claims
+   court (paragraph 20.3(c)) or in arbitration (paragraph 20.3(d)). The
+   one-year period begins when the claim or dispute first could be filed.
+   If such a claim or dispute is not filed within one year, it is
+   permanently barred.
+
+   (h) Rejecting Future Arbitration Changes. You may reject any change
+   Skype makes to paragraph 20.3 (other than address changes) by sending
+   us notice within 30 days of the change by U.S. Mail to the address in
+   paragraph 20.3(b). If you do, the most recent version of paragraph 20.3
+   before the change you rejected will apply.
+
+   (i) If the class action waiver in paragraph 20.3(e) is found to be
+   illegal, invalid or unenforceable as to all or some parts of a dispute,
+   then paragraph 20.3 will not apply to those parts. Instead, those parts
+   will be severed and proceed in a court of law, with the remaining parts
+   proceeding in arbitration. If any other provision of paragraph 20.3 is
+   found to be illegal, invalid or unenforceable, that provision will be
+   severed with the remainder of paragraph 20.3 remaining in full force
+   and effect.
+
+   YOU EXPRESSLY ACKNOWLEDGE THAT YOU HAVE READ THESE TERMS AND UNDERSTAND
+   THE RIGHTS, OBLIGATIONS, TERMS AND CONDITIONS SET FORTH HEREIN. BY
+   CLICKING ON THE ACCEPT BUTTON AND/OR CONTINUING TO INSTALL THE SOFTWARE
+   OR USE THE SOFTWARE, PRODUCTS AND/OR SKYPE WEBSITES, YOU EXPRESSLY
+   CONSENT TO BE BOUND BY ITS TERMS AND CONDITIONS AND GRANT TO SKYPE THE
+   RIGHTS SET FORTH HEREIN.
+
+© Skype – Last updated: April 2013
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 6c15fef0c1c9..dd9f39dcf722 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-1.2.8.tar.xz 1423888 SHA256 485438d8c38ada1a6e95c9ea1298d2c899d4ec61
 DIST rspamd-1.3.2.tar.xz 1476656 SHA256 283227d8f38fcc4c5d4b913996b52f55370c5445ec6f8dbb550aec2bb2d46c2a SHA512 75a5526852cbd60e0b8f06f9b722a686f3ef59ae2a0f132018465fb9d104ca847d71a5e38343b288149ebc5ba9b4f749ba72551568e338e6509c5d2ac13bd061 WHIRLPOOL 82749f3f2afd3cf3289a6b4862220d2a04d84e0bd59079daa24427b34a754300f8cf0d5e7eea52cba7090cc2c07e005573bd481573f89e1bff59f741889a1ef7
 DIST rspamd-1.3.3.tar.xz 1481836 SHA256 1296d3d0d97226e238c5d5954f58f2154bcbde4ba3ed45647b6b75da7a2e2b17 SHA512 9a1be238678bd9379000d2a7298308f7286ee4b8f1abb8c4f199d16a57183f91d29533533ceda244c382180cbdeb5e16c9b473899d3f0b813c8ea8519f8a7833 WHIRLPOOL 84d521746dc4a17648c82e11df56e3931dc37db413569f46bf8e2163c64b89c23700ee3567f4002863c624180b7efc8781b01d842060e7dc0f678e2ec8712709
 DIST rspamd-1.3.4.tar.xz 1484632 SHA256 64fcabb3dc6767b5dc22c89f968414d1028f34ab8a21e1b22482aace069d527c SHA512 41a3aa9b699ca1e40d229ebc9c3fd41ef07ad99b0badda44481fe4ff3003000069352f58379fa47013f96d98b08430a3c7bea0d97cab4a7e6db17a9084b082d6 WHIRLPOOL ab5a25d673423e15ae77c704345307a555edcfad502d951da46ece04ef220baab056c80acdf898fa4e3748b644a41e9b9ee64b73333c1bebbc5e514be5c0310d
+DIST rspamd-1.3.5.tar.xz 1483044 SHA256 d4413ccfc238c3023e2b8a9441b101a6437f521f333fc9db2dd924d473fee696 SHA512 6d7223c6be6e49296a5228d3d05a5f8dfd4a4002df9d247740bce75f2f652a01d86c30456b8475d08d529d2787aa30191713961ffc82c380c00612cae371b61c WHIRLPOOL 4017484d4653a23b5a987ab0bdd40a709cd5d116dea5c02a767c5cad94bd5399d6319aa8f75e726cec5d0bd7ae9e0722786cacc33963e2f9b8fbdd0fb0986729
diff --git a/mail-filter/rspamd/files/rspamd.init-r2 b/mail-filter/rspamd/files/rspamd.init-r2
new file mode 100644
index 000000000000..bf6f9ca8bcfe
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd.init-r2
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+RUNDIR=/var/run/rspamd
+PIDFILE=$RUNDIR/rspamd.pid
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	/usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.sysvinit.conf > /dev/null \
+		|| return 1
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+
+	mkdir -m0750 -p $RUNDIR
+	chown rspamd:rspamd $RUNDIR
+	chmod g+s $RUNDIR
+	rm -f $RUNDIR/$SVCNAME.sock
+
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
+						--exec /usr/bin/rspamd
+	eend $?
+}
+
+stop() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
+						--exec /usr/bin/rspamd
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE
+	eend $?
+}
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 99b50408b516..aee0fd268f81 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">vstakhov/rspamd</remote-id>
   </upstream>
+  <use>
+    <flag name="fann">Enable neural network plugin (requires <pkg>sci-mathematics/fann</pkg>).</flag>
+  </use>
 </pkgmetadata>
diff --git a/mail-filter/rspamd/rspamd-1.3.5.ebuild b/mail-filter/rspamd/rspamd-1.3.5.ebuild
new file mode 100644
index 000000000000..517936550ad5
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.3.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user systemd
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fann +jit"
+
+RDEPEND="dev-libs/openssl:0[-bindist]
+		fann? ( sci-mathematics/fann )
+		jit? (
+			dev-libs/libpcre[jit]
+			dev-lang/luajit:2
+		)
+		!jit? (
+			dev-libs/libpcre[-jit]
+			>=dev-lang/lua-5.1:0
+		)
+		dev-libs/libevent
+		dev-db/sqlite:3
+		dev-libs/glib:2
+		dev-libs/gmime
+		dev-util/ragel
+		sys-apps/file
+		virtual/libiconv"
+DEPEND="dev-util/ragel
+		${RDEPEND}"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_FANN=$(usex fann ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r2" rspamd
+
+	dodir /var/lib/rspamd
+	dodir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+
+	systemd_newunit rspamd.service rspamd.service
+}
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
new file mode 100644
index 000000000000..afe06dcb8807
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
@@ -0,0 +1,38 @@
+From 1b4478eab642787c43601259611f7b27e0bb473b Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux@googlemail.com>
+Date: Thu, 9 Jun 2016 10:06:34 +0100
+Subject: [PATCH] fix build with kernel-4.7
+
+---
+ cpufreq/src/cpufreq-monitor-libcpufreq.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 40c44ba..5fe79fb 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -23,8 +23,11 @@
+ #include <glib/gi18n.h>
+ 
+ #include <stdlib.h>
++#include <linux/version.h>
+ #include <cpufreq.h>
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++#include <cpuidle.h>
++#endif
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+ 
+@@ -111,7 +114,11 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
+ 		/* Check whether it failed because
+ 		 * cpu is not online.
+ 		 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+ 		if (!cpufreq_cpu_exists (cpu)) {
++#else
++		if (cpupower_is_cpu_online (cpu)) {
++#endif
+ 			g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
+ 			return TRUE;
+ 		}
diff --git a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
deleted file mode 100644
index 880afc75b76b..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Obtained from: http://pkgs.fedoraproject.org/cgit/mate-applets.git/plain/cpufreq.patch
-
-diff -upr mate-applets-1.5.0-orig/configure.ac mate-applets-1.5.0/configure.ac
---- mate-applets-1.5.0-orig/configure.ac	2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/configure.ac	2013-01-14 18:04:15.726598991 +0100
-@@ -506,13 +506,13 @@ if test "x$HAVE_POLKIT" = "xyes"; then
- fi
- 
- AC_CHECK_HEADER(cpufreq.h, have_libcpufreq=yes, have_libcpufreq=no)
--LIBCPUFREQ_LIBS=
--if test "x$have_libcpufreq" = "xyes"; then
--   AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
--   LIBCPUFREQ_LIBS=-lcpufreq
-+LIBCPUPOWER_LIBS=
-+if test "x$have_libcpupower" = "xyes"; then
-+   AC_DEFINE([HAVE_LIBCPUPOWER], [1], [Have libcpupower.])
-+   LIBCPUPOWER_LIBS=-lcpupower
- fi
--AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
--AC_SUBST(LIBCPUFREQ_LIBS)
-+AM_CONDITIONAL(HAVE_LIBCPUPOWER, test x$have_libcpupower = xyes)
-+AC_SUBST(LIBCPUPOWER_LIBS)
- 
- build_cpufreq_applet=no
- 
-diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c
---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2013-01-14 19:15:28.432366287 +0100
-@@ -24,7 +24,7 @@
- #include "cpufreq-selector-factory.h"
- #include "cpufreq-selector-sysfs.h"
- #include "cpufreq-selector-procfs.h"
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- #include "cpufreq-selector-libcpufreq.h"
- #endif
- 
-@@ -33,7 +33,7 @@ cpufreq_selector_factory_create_selector
- {
- 	CPUFreqSelector *selector = NULL;
- 	
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- 	selector = cpufreq_selector_libcpufreq_new (cpu);
- #else
- 	if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
-@@ -41,7 +41,7 @@ cpufreq_selector_factory_create_selector
- 	} else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- 		selector = cpufreq_selector_procfs_new (cpu);
- 	}
--#endif /* HAVE_LIBCPUFREQ */
-+#endif /* HAVE_LIBCPUPOWER */
- 
- 	return selector;
- }
-diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am
---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am	2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am	2013-01-14 19:13:27.223180712 +0100
-@@ -16,7 +16,7 @@ if CPUFREQ_SELECTOR_SUID
- endif
- 
- 
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-selector-libcpufreq.c        cpufreq-selector-libcpufreq.h
- endif
- 
-diff -upr mate-applets-1.5.0-orig/cpufreq/src/Makefile.am mate-applets-1.5.0/cpufreq/src/Makefile.am
---- mate-applets-1.5.0-orig/cpufreq/src/Makefile.am	2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/Makefile.am	2013-01-14 19:14:01.647517888 +0100
-@@ -12,7 +12,7 @@ INCLUDES = \
- 
- libexec_PROGRAMS = mate-cpufreq-applet
- 
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-monitor-libcpufreq.c    cpufreq-monitor-libcpufreq.h
- endif
- 
diff --git a/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
new file mode 100644
index 000000000000..4743098df388
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-single-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="X ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.10:0
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2=
+	>=gnome-extra/gucharmap-2.32.1:0
+	>=mate-base/mate-desktop-1.10:0
+	>=mate-base/mate-panel-1.10:0
+	>=mate-base/mate-settings-daemon-1.10:0
+	>=sys-apps/dbus-1.1.2:0
+	sys-power/cpupower
+	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/gtksourceview:2.0
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	>=x11-libs/libwnck-2.30:1
+	x11-libs/pango:0
+	>=x11-themes/mate-icon-theme-1.10:0
+	virtual/libintl:0
+	policykit? ( >=sys-auth/polkit-0.92:0 )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35:*
+	dev-libs/libxslt:0
+	>=mate-base/mate-common-1.10:0
+	sys-devel/gettext:*
+	sys-kernel/linux-headers
+	virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.10.4-kernel-4.7.patch" )
+
+src_configure() {
+	gnome2_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--with-cpufreq-lib=cpupower \
+		$(use_enable ipv6) \
+		$(use_enable policykit polkit) \
+		$(use_with upower) \
+		$(use_with X x)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+	python_fix_shebang invest-applet
+	gnome2_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet mateweather multiload null_applet stickynotes
+			timerapplet trashapplet"
+
+	for applet in ${APPLETS}; do
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+	done
+}
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
similarity index 96%
rename from mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
rename to mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
index ecc284b8d2b9..bfa64ba80b99 100644
--- a/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
@@ -65,8 +65,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50.1:*
 	dev-libs/libxslt:0
 	sys-devel/gettext:*
+	sys-kernel/linux-headers
 	virtual/pkgconfig:*"
 
+PATCHES=( "${FILESDIR}/${PN}-1.10.4-kernel-4.7.patch" )
+
 src_configure() {
 	mate_src_configure \
 		--libexecdir=/usr/libexec/mate-applets \
diff --git a/mate-base/mate/mate-1.10.0-r2.ebuild b/mate-base/mate/mate-1.10.0-r2.ebuild
deleted file mode 100644
index f7773d1c127e..000000000000
--- a/mate-base/mate/mate-1.10.0-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit versionator
-
-MATE_MV="$(get_version_component_range 1-2)"
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+base -bluetooth +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_MV}*:0
-	=mate-base/mate-menus-${MATE_MV}*:0
-	=mate-base/mate-panel-${MATE_MV}*:0
-	=mate-base/mate-session-manager-${MATE_MV}*:0
-	=mate-base/mate-settings-daemon-${MATE_MV}*:0
-	=x11-wm/marco-${MATE_MV}*:0
-	base? (
-		=mate-base/caja-${MATE_MV}*:0
-		=mate-base/mate-applets-meta-${MATE_MV}*:0
-		=mate-base/mate-control-center-${MATE_MV}*:0
-		=mate-extra/mate-media-${MATE_MV}*:0
-		=x11-misc/mozo-${MATE_MV}*:0
-		=x11-terms/mate-terminal-${MATE_MV}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_MV}*:0
-		=x11-themes/mate-icon-theme-${MATE_MV}*:0
-		=x11-themes/mate-themes-meta-${MATE_MV}*:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_MV}*:0
-		=app-editors/pluma-${MATE_MV}*:0
-		=app-text/atril-${MATE_MV}*:0
-		gnome-extra/gnome-calculator:0
-		=mate-extra/caja-extensions-${MATE_MV}*:0
-		=mate-extra/mate-netbook-${MATE_MV}*:0
-		=mate-extra/mate-power-manager-${MATE_MV}*:0
-		=mate-extra/mate-screensaver-${MATE_MV}*:0
-		=mate-extra/mate-system-monitor-${MATE_MV}*:0
-		=mate-extra/mate-utils-${MATE_MV}*:0
-		=media-gfx/eom-${MATE_MV}*:0
-		=net-analyzer/mate-netspeed-${MATE_MV}*:0
-		sys-apps/gnome-disk-utility:0
-	)
-"
-
-PDEPEND="
-	notification? ( x11-misc/mate-notification-daemon )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "MATE 1.10 had some packages renamed, replaced and/or dropped; for more"
-	elog "details, see http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/"
-	elog ""
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
new file mode 100644
index 000000000000..dff6dbe5582f
--- /dev/null
+++ b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
@@ -0,0 +1,53 @@
+From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001
+From: Kir Kolyshkin <kir@openvz.org>
+Date: Mon, 16 May 2016 14:52:28 -0700
+Subject: [PATCH] mate-dict.pc: depend upon proper gtk version
+
+If the package is built against gtk-3.0 (as in
+./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0
+since it's hardcoded it there. This can lead to improper builds
+of packages using libmatedict (although I can't find any now),
+as well as improper RPM dependencies, like this:
+
+	$ rpm -e gtk2-devel
+	error: Failed dependencies:
+	...
+	pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64
+
+Fortunately, the file is already generated, so it's trivial to add
+a proper substitution.
+
+[v2: also add min GTK version required]
+
+Signed-off-by: Kir Kolyshkin <kir@openvz.org>
+---
+ configure.ac                             | 2 ++
+ mate-dictionary/libgdict/mate-dict.pc.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 64aba70..39cc6f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,6 +89,8 @@ case "$with_gtk" in
+ 		LIBCANBERRA_GTK_REQUIRED=0.4
+ 		;;
+ esac
++AC_SUBST(GTK_API_VERSION)
++AC_SUBST(GTK_REQUIRED)
+ 
+ # common checks
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in
+index e409a0c..8168de2 100644
+--- a/mate-dictionary/libgdict/mate-dict.pc.in
++++ b/mate-dictionary/libgdict/mate-dict.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: gdict-1.0
+ Description: MATE Dictionary Protocol client library
+-Requires: gtk+-2.0
++Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
+ Version: @GDICT_VERSION@
+ Libs: -L${libdir} -lmatedict
+ Cflags: -I${includedir}/mate-dict
diff --git a/mate-extra/mate-utils/mate-utils-1.10.4-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.10.4-r1.ebuild
new file mode 100644
index 000000000000..8005839c8eb0
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.10.4-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Utilities for the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="X applet ipv6 test"
+
+RDEPEND="app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4:0[gtk]
+	sys-libs/zlib:0
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.10:0 )"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50:*
+	>=mate-base/mate-common-1.10:0
+	x11-proto/xextproto:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove -D.*DISABLE_DEPRECATED cflagss
+	# This method is kinda prone to breakage. Recheck carefully with next bump.
+	# bug 339074
+	LC_ALL=C find . -iname 'Makefile.am' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+
+	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+	LC_ALL=C find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+
+	if ! use test; then
+		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die
+	fi
+
+	# Fix up desktop files.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e 's/Categories\(.*\)MATE/Categories\1X-MATE/' -i {} + || die
+
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+}
+
+src_configure() {
+	local myconf
+	if ! use debug; then
+		myconf="${myconf} --enable-debug=minimum"
+	fi
+
+	gnome2_src_configure \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6) \
+		$(use_with X x) \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		${myconf}
+}
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
similarity index 85%
rename from mate-extra/mate-utils/mate-utils-1.12.0-r1.ebuild
rename to mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
index 9453ec5bda60..53697320f919 100644
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r1.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
@@ -50,6 +50,16 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
+PATCHES=( "${FILESDIR}/${P}-dict-gtk3.patch" )
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
 src_configure() {
 	mate_src_configure \
 		--disable-maintainer-flags \
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 4e33bd124e93..add208669033 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,3 +1,4 @@
 DIST asymptote-2.32.src.tgz 1794495 SHA256 2035035e02774598312d5588da2685d20fb85a378ea2bbe48b825c5442b18fa5 SHA512 a0663f1768cb4340bb6e9224d4fbc6e2f8b41501b1f59793d84db2e0f99b9ff071d3dd8fa5c4715c1874f8ef1af713a54b27de37ff40d8ca042f0f48579a57f9 WHIRLPOOL 38a8aaa581acb07bcc7ac0c802222501acf77abaf609d5ae758d9b5668ac6b8b1343640259cc3948e62a39862404709ddb64b4bbd11bcf20dbb7ce29d4fc25d1
 DIST asymptote-2.35.src.tgz 3348122 SHA256 ff3cf5b6a6a65fb1fe5b3ef1e94bf9cff8c3376f0cd7be0fdd7079c0fb46c285 SHA512 671ffdde35b444b645d5ebea016b7fec583c4cecee67cf1700c4b3e2c783abfcc45dfa964864c8bd66be32c13fb109c139346c0dbcfb1b597d4d387ad19c6c97 WHIRLPOOL 70cde1fb0821bd7efa27629183fe36871b45d7f352f5a1e529fbdf3c0d50c53059a7d4befcd4d87663da365733b43006ef1399b5541095d85068c63200e1ddf7
 DIST asymptote-2.36.src.tgz 3449528 SHA256 cd3276cba498965f8c9e6c56b157d2f22304b0453d175bd9017b4c62b3fd1750 SHA512 18b079829f90561f88ebde0391f5d842d89ea28bf7b00306b908faeeca21b421127423af3a335bab9afa22036b3d93611702a579513d8a458be2f8cdd542222f WHIRLPOOL 532b221d619c8af077e0ef4cda960e6bc1b2c2eab263cfa1eb729df5928f7ae1d9e05459efee18a5a4fa4464b0b3aacd7f5ab42076e8af4e1fc3745f75dd9b6c
+DIST asymptote-2.38.src.tgz 3460789 SHA256 e9c6dbb3fed27cbaf9ba01fd2264f0cff51781466acb29e76418bed801debcb7 SHA512 c54974a0476a33112c7913cfd8962e80a5ff10bc11f65b59a2bc0641f3c2fcfe69ba4592d84b33078d85c43fab7261670195766eca6419f6fd4923fd1ace6904 WHIRLPOOL f1d0a31fe25046c072a4963f64c92f718d980712f46637db65a5664c0a94c1eba162902c9ec4e787685f2250158ecffa9e834564ecbd69c6e3b948c5ad7d7a24
diff --git a/media-gfx/asymptote/asymptote-2.38.ebuild b/media-gfx/asymptote/asymptote-2.38.ebuild
new file mode 100644
index 000000000000..ac5a8b7a9acd
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.38.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools elisp-common eutils latex-package multilib python-single-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="http://asymptote.sourceforge.net/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	offscreen? ( opengl )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( >=media-libs/mesa-8 )
+	offscreen? ( media-libs/mesa[osmesa] )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+	fftw? ( >=sci-libs/fftw-3.0.1 )
+	gsl? ( sci-libs/gsl )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		${PYTHON_DEPS}
+		x11-misc/xdg-utils
+		dev-python/pillow[tk,${PYTHON_USEDEP}]
+		)
+	latex? (
+		virtual/latex-base
+		>=dev-texlive/texlive-latexextra-2013
+		)
+	emacs? ( virtual/emacs )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-lang/perl
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		)"
+
+TEXMF=/usr/share/texmf-site
+
+pkg_setup() {
+	(use python || use X) && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# gc.h -> gc/gc.h
+	epatch "${FILESDIR}/${P}-configure-ac.patch"
+
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	# Changing pdf, ps, image viewers to xdg-open
+	epatch "${FILESDIR}/${P}-xdg-utils.patch"
+
+	# Bug #322473
+	epatch "${FILESDIR}/${P}-info.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
+		$(use_enable sigsegv)
+}
+
+src_compile() {
+	default
+
+	cd doc || die
+	emake asy.1
+	if use doc; then
+		# info
+		einfo "Making info"
+		emake ${PN}.info
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins base/*.asy
+
+	# documentation
+	dodoc BUGS ChangeLog README ReleaseNotes TODO
+	doman doc/asy.1
+
+	# X GUI
+	if use X; then
+		python_scriptinto /usr/share/${PN}/GUI
+		python_doscript GUI/*.py
+		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins \
+			examples/*.asy \
+			examples/*.eps \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/extra/*.asy
+		use X && doins GUI/*.asy
+
+		insinto /usr/share/${PN}/examples/animations
+		doins examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins ${PN}.sty asycolors.sty
+		if use examples; then
+			insinto /usr/share/${PN}/examples
+			doins latexusage.tex
+		fi
+		cd .. || die
+	fi
+
+	# asymptote.py
+	use python && python_domodule base/${PN}.py
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/asy-ftd.vim
+	fi
+
+	# extra documentation
+	if use doc; then
+		cd doc || die
+		doinfo ${PN}.info*
+		cd FAQ || die
+		dodoc asy-faq.ascii
+		doinfo asy-faq.info
+		insinto /usr/share/doc/${PF}/html/FAQ
+		doins asy-faq.html/*
+		cd .. || die
+		insinto /usr/share/doc/${PF}
+		doins ${PN}.pdf CAD.pdf
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/asymptote/files/asymptote-2.38-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.38-configure-ac.patch
new file mode 100644
index 000000000000..3acff863dad9
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.38-configure-ac.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.38/configure.ac
+===================================================================
+--- asymptote-2.38.orig/configure.ac
++++ asymptote-2.38/configure.ac
+@@ -156,7 +156,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
+       fi
+       CPPFLAGS_SAVE=$CPPFLAGS
+       CPPFLAGS=$CPPFLAGS" $INCL"
+-      AC_CHECK_HEADER(gc.h,
++      AC_CHECK_HEADER([gc/gc.h],
+ 	AC_CHECK_LIB([gc],[GC_malloc],[
+ 	  LIBS=$LIBS"-lgc "
+ 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.38-info.patch b/media-gfx/asymptote/files/asymptote-2.38-info.patch
new file mode 100644
index 000000000000..7005f152518f
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.38-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.38/doc/asymptote.texi
+===================================================================
+--- asymptote-2.38.orig/doc/asymptote.texi
++++ asymptote-2.38/doc/asymptote.texi
+@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
+      
+ @dircategory Languages
+ @direntry
+-* asymptote: (asymptote/asymptote). Vector graphics language.
++* asymptote: (asymptote). Vector graphics language.
+ @end direntry
+ 
+ @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.38-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.38-xdg-utils.patch
new file mode 100644
index 000000000000..044244e4008a
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.38-xdg-utils.patch
@@ -0,0 +1,23 @@
+Index: asymptote-2.38/settings.cc
+===================================================================
+--- asymptote-2.38.orig/settings.cc
++++ asymptote-2.38/settings.cc
+@@ -91,15 +91,15 @@ bool msdos=false;
+ string HOME="HOME";
+ string docdir=ASYMPTOTE_DOCDIR;
+ const char pathSeparator=':';
+-string defaultPSViewer="gv";
++string defaultPSViewer="xdg-open";
+ #ifdef __APPLE__
+ string defaultPDFViewer="open";
+ #else  
+-string defaultPDFViewer="acroread";
++string defaultPDFViewer="xdg-open";
+ #endif  
+ string defaultGhostscript="gs";
+ string defaultGhostscriptLibrary="/usr/lib/libgs.so";
+-string defaultDisplay="display";
++string defaultDisplay="xdg-open";
+ string defaultAnimate="animate";
+ void queryRegistry() {}
+ const string dirsep="/";
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index c73273156a00..463325fae987 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,2 +1,3 @@
 DIST DisplayCAL-3.1.2.0.tar.gz 9361108 SHA256 78dbfd2be1cf7542657cc0f5ed9e16e27558206a4878ffae5ce68bd62460680d SHA512 2c14ed0230e6bdd6f8876a5e8887498e3005941e2f68aedad2926f9b8dda642e909f9aa70205977123b1b7c1376dd3f361ad08ecc5015bfae77342ff1b848837 WHIRLPOOL 74f311618190974e6e9c0c5b895ab7f0dba18de06e52dcf1cca4df0373a278b4c4e170b6add51bdf550b21499ff1ecf249cae6f2eb2f3e0813c666bd0bc4f941
 DIST DisplayCAL-3.1.3.1.tar.gz 9555280 SHA256 d48e0b12c0b4fe75e0c99eb5fd85c8651afc2c3a2e72d29ade9bb0a76e61f645 SHA512 ef560155cf0eebf4fcd9beab699afd6f0e766901e44d6aba8f33242662aae68a5644e6e253f3bdfe2bb687b30e967190ddf746ef4467c41c9cda06c6bd9326ef WHIRLPOOL b696c68d7b25388b51c056534ca37f7e14d0f918b2471cd1e6662cfadc186eb989ad9429c3a40bc74992c9352d762c40e05add69773a834e99971ac46339f015
+DIST DisplayCAL-3.1.6.0.tar.gz 9592426 SHA256 fc27814cf29b3643f8a44973f2139518c133f6a2549ffe51658e765a67cd02fd SHA512 ea5d0c5028c9dcfc834c03bd50d9e4cd5f4528ac0adf1312117128f8969533f857eaab738019d561b8197ad595ca73ad085db4feb36101df1e303933e1edbd87 WHIRLPOOL 6a23f57e606852838b43834d81acd346be1746040d47ac5884c997d828130ddf5b2049b8684d2de42b555ab7b6b6fb4d0430544d2586ca388eb769fbecc86be6
diff --git a/media-gfx/displaycal/displaycal-3.1.6.0.ebuild b/media-gfx/displaycal/displaycal-3.1.6.0.ebuild
new file mode 100644
index 000000000000..0d69de973612
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.1.6.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 fdo-mime eutils
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:2.8
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-proto/xineramaproto-1.2
+	>=x11-libs/libXinerama-1.1"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1"
+
+# Just in case someone renames the ebuild
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+	README.html
+)
+
+src_prepare() {
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	cd "${S}/DisplayCAL" || die "Cannot cd to source directory."
+	sed -e 's/if which(\"xdg-icon-resource\"):/if which(\"xdg-icon-resource-non-existant\"):/' \
+		-e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
+		-i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
+
+	# Remove deprecated Encoding key from .desktop file
+	cd "${S}" || die "Cannot cd to work directory."
+	for offendingFile in $(grep -r -l "Encoding=UTF-8" .); do
+		sed -e '/Encoding=UTF-8/d' -i "${offendingFile}" || \
+		die "removing deprecated Encoding key from .desktop files failed"
+	done
+
+	# Remove x-world Media Type
+	cd "${S}/misc" || die "Cannot cd to misc directory."
+	sed -e 's/x\-world\/x\-vrml\;//g' -i "displaycal-vrml-to-x3d-converter.desktop" \
+		|| die "removing x-world media type failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	#remove udev files
+	rm -rf "${D}"/etc/udev/rules.d
+}
+
+pkg_postinst() {
+	# Run xdg-* programs the Gentoo way since we removed this
+	# functionality from the original package
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	# Run xdg-* programs the Gentoo way since we removed this
+	# functionality from the original package
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/eom/eom-1.12.2-r2.ebuild b/media-gfx/eom/eom-1.12.2-r3.ebuild
similarity index 97%
rename from media-gfx/eom/eom-1.12.2-r2.ebuild
rename to media-gfx/eom/eom-1.12.2-r3.ebuild
index af12c2f7bc4d..13d7c1ffd10f 100644
--- a/media-gfx/eom/eom-1.12.2-r2.ebuild
+++ b/media-gfx/eom/eom-1.12.2-r3.ebuild
@@ -62,6 +62,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
+PATCHES=( "${FILESDIR}/${P}-gtk3-svg.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch b/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
new file mode 100644
index 000000000000..ccff8ae923a9
--- /dev/null
+++ b/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
@@ -0,0 +1,33 @@
+From 038530ed2e9b844f75e2af24e44e0421ad1ccdc8 Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Wed, 24 Feb 2016 16:47:08 +0300
+Subject: [PATCH] fix svg rendering that's broken with GTK+3
+
+from
+https://git.gnome.org/browse/eog/commit/?id=a33950c14d7b8da8e1c6289709022affb910be2a
+---
+ src/eom-scroll-view.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
+index 6385f29..6d1b290 100644
+--- a/src/eom-scroll-view.c
++++ b/src/eom-scroll-view.c
+@@ -1306,7 +1306,7 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+ 
+ #ifdef HAVE_RSVG
+ 	if (eom_image_is_svg (view->priv->image)) {
+-		cairo_matrix_t matrix, translate, scale;
++		cairo_matrix_t matrix, translate, scale, original;
+ 		EomTransform *transform = eom_image_get_transform (priv->image);
+ 		cairo_matrix_init_identity (&matrix);
+ 		if (transform) {
+@@ -1343,6 +1343,8 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+ 		cairo_matrix_init_translate (&translate, xofs, yofs);
+ 		cairo_matrix_multiply (&matrix, &matrix, &translate);
+ 
++		cairo_get_matrix (cr, &original);
++		cairo_matrix_multiply (&matrix, &matrix, &original);
+ 		cairo_set_matrix (cr, &matrix);
+ 
+ 		rsvg_handle_render_cairo (eom_image_get_svg (priv->image), cr);
diff --git a/media-libs/gd/gd-2.2.3.ebuild b/media-libs/gd/gd-2.2.3.ebuild
index 529221bef76b..2cf3e7d023b6 100644
--- a/media-libs/gd/gd-2.2.3.ebuild
+++ b/media-libs/gd/gd-2.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index e64dc2d505a4..1efba5f3c8aa 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,4 @@
 DIST rhythmbox-3.3.1.tar.xz 6853084 SHA256 ef3c1023ed05025cd2aaed9ca83bf9bc557e4e8da660d7f31c5e3158fda93c61 SHA512 38fad18c51037c2933e32f265dc1713346db26163f4c50308b1c457cae4faf5926b31c029e3f8c1c1d75da8578f4960496237bf8add7c588e6011f849c7da41c WHIRLPOOL 26cc782ef6a0f5c47545959ccc58689e0ecb794d8af8299171ad91d2f5c59944b0c76909f53710360b3219555cc183211cac8e0e4b2372d8342e44d272ac61ee
 DIST rhythmbox-3.3.tar.xz 6863500 SHA256 5299ac4d3dbc4e281aa422e957b3a7741207512ae051fdfc8159e1322b486859 SHA512 ff717015ec0d95e72abf7f356b3d83bfac744d3d032d35bf9b0f5452caa8e9130bc7446d8079f9e36eaa07b518dea5a6c2fc848cf326c9d0bd1ab17d58a95518 WHIRLPOOL faeedadb1735b9a77c75ecaa80d0c14608d3186916d81e2647c9c3d981305c24d8972f1c93d0b197a3c81140a8559eb4ecf38f506818cf9ebc703b53b9926e89
+DIST rhythmbox-3.4.1.tar.xz 6914220 SHA256 039f86661cba495f9429df6572fa79e68279635809e52fa0d19f57e8db8341b6 SHA512 b00034e9369222f64d5d9c5e246b99f5d738336d3faf2d303c444f84c316688871e0a09992e96012f38e2e90e8efc936ad231bed5057a5aaf31ee66963f59ae6 WHIRLPOOL 08997a533857a3545d926730be9f9f8f0b420da976011598919520b18546959658765eb7bfdfe7fce430706b9b1a882c46ea6cba1d9b968b6433c8ec2791adf2
 DIST rhythmbox-3.4.tar.xz 6910300 SHA256 ef8592aa0ee184e40d23a5007885c32585325b462e78cb0ff95181540f39878c SHA512 089568ecd932f7ca761f54389ab7008a8bc8d3bda3f35def0cc8370043fda804bc7eb5285ff574adafedfa1392422338e38a6bf40f1cb1bd77b93f9fe576d186 WHIRLPOOL 8186a1514985e66ddd5b30c663b1707c6850eca3ca8006024f8d0b914a09b43ffeed0306e2c55deeecb7769f85e1145cb36e89f05a1253df714f219034f3cad0
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.1.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.1.ebuild
new file mode 100644
index 000000000000..141a32fcf95a
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{3,4,5} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-r1 multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av visualizer zeitgeist"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ^^ ( $(python_gen_useflags '*') ) )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.7.8:2
+	>=x11-libs/gtk+-3.16:3[X,introspection]
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=dev-libs/libpeas-0.7.3[gtk,python?]
+	>=dev-libs/totem-pl-parser-3.2
+	>=net-libs/libsoup-2.42:2.4
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
+	>=media-libs/gstreamer-1.4:1.0[introspection]
+	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		>=media-plugins/gst-plugins-soup-1.4:1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? ( >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] )
+	udev? (
+		virtual/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 ) )
+	visualizer? (
+		>=media-libs/clutter-1.8:1.0
+		>=media-libs/clutter-gst-1.9.92:2.0
+		>=media-libs/clutter-gtk-1.0:1.0
+		>=x11-libs/mx-1.0.1:1.0
+		>=media-plugins/gst-plugins-libvisual-1.4:1.0 )
+	zeitgeist? ( gnome-extra/zeitgeist )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[${PYTHON_USEDEP}]
+		net-libs/libsoup:2.4[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
+	upnp-av? (
+		>=media-libs/grilo-0.3:0.3
+		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=737831
+	rm -v lib/rb-marshal.{c,h} || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
+	gnome2_src_configure \
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
+		VALAC=$(type -P true) \
+		--enable-mmkeys \
+		--disable-more-warnings \
+		--disable-static \
+		--disable-vala \
+		--without-hal \
+		$(use_enable visualizer) \
+		$(use_enable daap) \
+		$(use_enable libnotify) \
+		$(use_enable lirc) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable python) \
+		$(use_enable upnp-av grilo) \
+		$(use_with cdr brasero) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with ipod) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	virtx emake check CK_DEFAULT_TIMEOUT=60
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 0270daa81485..baeb956a7f6e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 12:10:38 +0000
+Sun, 11 Sep 2016 17:10:38 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0270daa81485..baeb956a7f6e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 12:10:38 +0000
+Sun, 11 Sep 2016 17:10:38 +0000
diff --git a/metadata/md5-cache/app-admin/conky-1.10.4 b/metadata/md5-cache/app-admin/conky-1.10.4
index 8481a79a6857..c62d501893dd 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.4
+++ b/metadata/md5-cache/app-admin/conky-1.10.4
@@ -10,4 +10,4 @@ RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.4.tar.gz -> conky-1.10.4.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=332763e683a31aa1ae2d84c872bbb2ef
+_md5_=045e08962a49be43e0fae4dcb6e69cc6
diff --git a/metadata/md5-cache/app-admin/keepassx-2.0.2-r1 b/metadata/md5-cache/app-admin/keepassx-2.0.2-r1
new file mode 100644
index 000000000000..66cb33da6300
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepassx-2.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-libs/libgcrypt:0= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qttest:4 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt password manager compatible with its Win32 and Pocket PC versions
+EAPI=6
+HOMEPAGE=http://www.keepassx.org/
+IUSE=test
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )
+RDEPEND=dev-libs/libgcrypt:0= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qttest:4 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst
+SLOT=0
+SRC_URI=https://www.keepassx.org/releases/2.0.2/keepassx-2.0.2.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7b65357bfbae8fe68d83ca53cc5154ad
diff --git a/metadata/md5-cache/app-admin/lib_users-0.9-r1 b/metadata/md5-cache/app-admin/lib_users-0.9-r1
new file mode 100644
index 000000000000..c5557ad28dff
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lib_users-0.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DESCRIPTION=Checks /proc for libraries being mapped but marked as deleted
+EAPI=5
+HOMEPAGE=http://schwarzvogel.de/software-misc.shtml
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.9.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=8a9348391a95e609cf139ed86862e1da
diff --git a/metadata/md5-cache/app-admin/paxtest-0.9.14 b/metadata/md5-cache/app-admin/paxtest-0.9.14
deleted file mode 100644
index 3e354876374e..000000000000
--- a/metadata/md5-cache/app-admin/paxtest-0.9.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/paxctl
-DESCRIPTION=PaX regression test suite
-EAPI=5
-HOMEPAGE=http://pax.grsecurity.net
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://grsecurity.net/~spender/paxtest-0.9.14.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=3bc785e0b9cba84ce83661ddf1cf1d66
diff --git a/metadata/md5-cache/app-admin/paxtest-0.9.15 b/metadata/md5-cache/app-admin/paxtest-0.9.15-r1
similarity index 90%
rename from metadata/md5-cache/app-admin/paxtest-0.9.15
rename to metadata/md5-cache/app-admin/paxtest-0.9.15-r1
index b327d70ca0ac..133f2d899c61 100644
--- a/metadata/md5-cache/app-admin/paxtest-0.9.15
+++ b/metadata/md5-cache/app-admin/paxtest-0.9.15-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-apps/paxctl
 DESCRIPTION=PaX regression test suite
-EAPI=5
+EAPI=6
 HOMEPAGE=http://pax.grsecurity.net
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://grsecurity.net/~spender/paxtest-0.9.15.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=44290a7815b779779d741e8afa10ef18
+_md5_=b41462f213566e34978cbb9e4c0f0384
diff --git a/metadata/md5-cache/app-admin/puppetserver-2.6.0 b/metadata/md5-cache/app-admin/puppetserver-2.6.0
new file mode 100644
index 000000000000..75263bbb42a8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-2.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=5
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7.0 app-admin/puppet-agent[puppetdb?]
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-2.6.0.tar.gz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
+_md5_=fb1a1d5fa959d59c748ec9255cf8d8ad
diff --git a/metadata/md5-cache/app-admin/salt-2016.3.3 b/metadata/md5-cache/app-admin/salt-2016.3.3
new file mode 100644
index 000000000000..b0fb5fb8dbbf
--- /dev/null
+++ b/metadata/md5-cache/app-admin/salt-2016.3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( dev-python/boto3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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=Salt is a remote execution and configuration manager
+EAPI=6
+HOMEPAGE=http://saltstack.org/
+IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
+KEYWORDS=~x86 ~amd64
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
+RESTRICT=x86? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/salt/salt-2016.3.3.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=31a7508db89b81c6bd501836c3e070d4
diff --git a/metadata/md5-cache/app-arch/engrampa-1.10.2-r1 b/metadata/md5-cache/app-arch/engrampa-1.10.2-r1
new file mode 100644
index 000000000000..492a824e804b
--- /dev/null
+++ b/metadata/md5-cache/app-arch/engrampa-1.10.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-2.24.0:2 >=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.10:0 ) magic? ( sys-apps/file ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.35:* >=mate-base/mate-common-1.8:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Engrampa archive manager for MATE
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=caja magic debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.24.0:2 >=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.10:0 ) magic? ( sys-apps/file ) !!app-arch/mate-file-archiver
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.10/engrampa-1.10.2.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=82c103df02bf61686ecd8bcc1f24b02f
diff --git a/metadata/md5-cache/app-arch/engrampa-1.12.0 b/metadata/md5-cache/app-arch/engrampa-1.12.0-r1
similarity index 80%
rename from metadata/md5-cache/app-arch/engrampa-1.12.0
rename to metadata/md5-cache/app-arch/engrampa-1.12.0-r1
index ffe0e5a6b830..8825636445c1 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.12.0
+++ b/metadata/md5-cache/app-arch/engrampa-1.12.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver >=dev-util/intltool-0.50.1:* dev-util/itstool:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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 >=mate-base/mate-common-1.12
+DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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 >=mate-base/mate-common-1.12
 DESCRIPTION=Engrampa archive manager for MATE
 EAPI=6
 HOMEPAGE=http://mate-desktop.org
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.12/engrampa-1.12.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mate	deba441b42c68cba7b817dd8b441788e	mate-desktop.org	69a0f50dcb300b04a513d60bc326029c	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=18de252cc0570fc05037c10f2271edc8
+_md5_=3e19f5530f86cbc87d0efad7f9253d1c
diff --git a/metadata/md5-cache/app-backup/dar-2.5.6 b/metadata/md5-cache/app-backup/dar-2.5.6
new file mode 100644
index 000000000000..d25705d4aeaa
--- /dev/null
+++ b/metadata/md5-cache/app-backup/dar-2.5.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install
+DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) xattr? ( sys-apps/attr:= ) ) lzo? ( !static? ( dev-libs/lzo:= ) ) nls? ( virtual/libintl ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen )
+DESCRIPTION=A full featured backup tool, aimed for disks (floppy,CDR(W),DVDR(W),zip,jazz etc.)
+EAPI=6
+HOMEPAGE=http://dar.linux.free.fr/
+IUSE=dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) xattr? ( sys-apps/attr:= ) ) lzo? ( !static? ( dev-libs/lzo:= ) ) nls? ( virtual/libintl )
+REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/dar/dar-2.5.6.tar.gz
+_eclasses_=confutils	18995f74ac4ffafb7ad853dfe133f209	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=9f4920a396603b2633544c8ace8c5fd5
diff --git a/metadata/md5-cache/app-crypt/eid-mw-4.1.18 b/metadata/md5-cache/app-crypt/eid-mw-4.1.18
new file mode 100644
index 000000000000..ad7cf27e19c2
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/eid-mw-4.1.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=gtk? ( x11-libs/gtk+:= ) >=sys-apps/pcsc-lite-1.2.9 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
+DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
+EAPI=5
+HOMEPAGE=http://eid.belgium.be
+IUSE=+gtk +xpi +dialogs
+KEYWORDS=~x86 ~amd64 ~arm
+LICENSE=LGPL-3
+RDEPEND=gtk? ( x11-libs/gtk+:= ) >=sys-apps/pcsc-lite-1.2.9 xpi? ( || ( >=www-client/firefox-bin-3.6.24 >=www-client/firefox-3.6.20 ) ) !app-misc/beid-runtime
+REQUIRED_USE=dialogs? ( gtk )
+SLOT=0
+SRC_URI=https://downloads.services.belgium.be/eid/eid-mw-4.1.18-v4.1.18.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=e0cd398ebc3679a88e712be9c6f461d2
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.9.0 b/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
new file mode 100644
index 000000000000..af8b17a91562
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=A derived Emacs mode implementing most of the C# rules
+EAPI=6
+HOMEPAGE=https://github.com/josteink/csharp-mode
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.0.tar.gz -> csharp-mode-0.9.0.tar.gz
+_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=bfa25355d89694e7147dd36b3ca524c0
diff --git a/metadata/md5-cache/app-emacs/desktop+-0.2 b/metadata/md5-cache/app-emacs/desktop+-0.2
new file mode 100644
index 000000000000..419528640268
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/desktop+-0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=app-emacs/dash app-emacs/f >=virtual/emacs-23
+DESCRIPTION=desktop+ extends standard desktop module
+EAPI=6
+HOMEPAGE=https://github.com/ffevotte/desktop-plus
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=app-emacs/dash app-emacs/f >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
+_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=addc7fb0b8f56e9258ae18a616206c05
diff --git a/metadata/md5-cache/app-emacs/f-0.18.2 b/metadata/md5-cache/app-emacs/f-0.18.2
new file mode 100644
index 000000000000..08ac91488c6e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/f-0.18.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
+DESCRIPTION=Modern API for working with files and directories in Emacs
+EAPI=6
+HOMEPAGE=https://github.com/rejeep/f.el
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/rejeep/f.el/archive/v0.18.2.tar.gz -> f-0.18.2.tar.gz
+_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=4ca62e31e76adc32cfb32081959218e8
diff --git a/metadata/md5-cache/app-emacs/s-1.11.0 b/metadata/md5-cache/app-emacs/s-1.11.0
new file mode 100644
index 000000000000..27331e46ffd5
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/s-1.11.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=The long lost Emacs string manipulation library
+EAPI=6
+HOMEPAGE=https://github.com/magnars/s.el
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/magnars/s.el/archive/1.11.0.tar.gz -> s-1.11.0.tar.gz
+_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=fb00620fa6dde1a958fc825759b6dfc2
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
new file mode 100644
index 000000000000..9a39a95e524c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst prepare setup unpack
+DEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
+DESCRIPTION=Commercial version of app-emulation/wine with paid support.
+EAPI=5
+HOMEPAGE=http://www.codeweavers.com/products/crossover/
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l python_targets_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=dev-lang/perl app-arch/unzip >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-dialup/capi4k-utils ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.2.0.bin
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be
+_md5_=25f4039653f183d7d26e7c187d68f40e
diff --git a/metadata/md5-cache/app-emulation/qemu-2.7.0-r1 b/metadata/md5-cache/app-emulation/qemu-2.7.0-r2
similarity index 99%
rename from metadata/md5-cache/app-emulation/qemu-2.7.0-r1
rename to metadata/md5-cache/app-emulation/qemu-2.7.0-r2
index 04e076e8c252..c643c3cb6d4d 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.7.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-2.7.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=5
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_unicore32 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_unicore32 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static-softmmu? ( qemu_softmmu_targets_aarch64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_alpha? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_arm? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_cris? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_m68k? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_microblaze? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_microblazeel? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mips? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mips64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mips64el? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_mipsel? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_or32? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_ppc? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_ppc64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_s390x? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sh4? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sh4eb? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sparc? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_sparc64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_unicore32? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_x86_64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_lm32? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_moxie? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_ppcemb? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_tricore? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_xtensa? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_xtensaeb? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.90 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gles2] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xfs? ( sys-fs/xfsprogs ) ) ) !static-user? ( qemu_user_targets_aarch64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_alpha? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_arm? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_cris? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_i386? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_m68k? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_microblaze? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_microblazeel? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_mips? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_mips64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_mips64el? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_mipsel? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_or32? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_s390x? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_sh4? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_sh4eb? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_sparc? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_sparc64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_unicore32? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_x86_64? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_armeb? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_mipsn32? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_mipsn32el? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc64abi32? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_ppc64le? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_sparc32plus? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) qemu_user_targets_tilegx? ( >=dev-libs/glib-2.0 dev-libs/libpcre sys-libs/zlib bzip2? ( app-arch/bzip2 ) xattr? ( sys-apps/attr ) ) ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.8.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.8.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xen? ( app-emulation/xen-tools:= ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.7.0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	l10n	e26ea0642846685782f1813642e7ff0f	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bd604bf051bfc879b6c97d2827034626
+_md5_=9a10532bb4f4ed2f711fe4a638644f89
diff --git a/metadata/md5-cache/app-emulation/spice-0.12.7-r1 b/metadata/md5-cache/app-emulation/spice-0.12.7-r1
index fc6581146889..f5f14af6a2d9 100644
--- a/metadata/md5-cache/app-emulation/spice-0.12.7-r1
+++ b/metadata/md5-cache/app-emulation/spice-0.12.7-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=~app-emulation/spice-protocol-0.12.11 virtual/pkgconfig || ( ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/six[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
 DESCRIPTION=SPICE server
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[
 SLOT=0
 SRC_URI=http://spice-space.org/download/releases/spice-0.12.7.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=54558e16660c2f3208e0d92b7161ded0
+_md5_=c76c385c42b85575c04ecdf22ac36e35
diff --git a/metadata/md5-cache/app-emulation/spice-0.13.1-r2 b/metadata/md5-cache/app-emulation/spice-0.13.1-r2
index e01a0adcb8db..62d4124182fb 100644
--- a/metadata/md5-cache/app-emulation/spice-0.13.1-r2
+++ b/metadata/md5-cache/app-emulation/spice-0.13.1-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=~app-emulation/spice-protocol-0.12.11 virtual/pkgconfig || ( ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/six[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) lz4? ( app-arch/lz4 ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
 DESCRIPTION=SPICE server
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[
 SLOT=0
 SRC_URI=http://spice-space.org/download/releases/spice-0.13.1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=db30efff8158744f6eb8f2ff007325e7
+_md5_=4b11eae85784eb4f3cd8924105079af6
diff --git a/metadata/md5-cache/app-emulation/spice-0.13.2 b/metadata/md5-cache/app-emulation/spice-0.13.2
index 25f0e60b6e40..0a1a686ccb84 100644
--- a/metadata/md5-cache/app-emulation/spice-0.13.2
+++ b/metadata/md5-cache/app-emulation/spice-0.13.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install setup
+DEFINED_PHASES=compile configure install setup
 DEPEND=~app-emulation/spice-protocol-0.12.12 virtual/pkgconfig || ( ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/six[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) lz4? ( app-arch/lz4 ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 )
 DESCRIPTION=SPICE server
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[
 SLOT=0
 SRC_URI=http://spice-space.org/download/releases/spice-0.13.2.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=9cc8b466cbbff45994df7de58780ef4a
+_md5_=5ec18455b7fd8271cfe36f3dcf32ff64
diff --git a/metadata/md5-cache/app-emulation/spice-9999 b/metadata/md5-cache/app-emulation/spice-9999
index 9c7794be45a3..9483e3f06ecb 100644
--- a/metadata/md5-cache/app-emulation/spice-9999
+++ b/metadata/md5-cache/app-emulation/spice-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare setup unpack
+DEFINED_PHASES=compile configure install prepare setup unpack
 DEPEND==app-emulation/spice-protocol-9999 virtual/pkgconfig || ( ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/six[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) lz4? ( app-arch/lz4 ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 ) >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=SPICE server
 EAPI=6
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) lz4? ( app-arch/lz4 ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=17b7076f8a0af522845d753a05ed3193
+_md5_=dee5e0eee902031677ca1dc2c0104469
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.38.106717 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.38.106717
index a00bdda2c287..a2838920662b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.38.106717
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.38.106717
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=amd64 x86
 LICENSE=PUEL
@@ -9,4 +9,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.38/Oracle_VM_VirtualBox_Extension_Pack-4.3.38-106717.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.38-106717.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d3b4e0fb9f8e4038d85a6886bb6146a5
+_md5_=710621b78a103ecd122d3efe50b26573
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.40.110317 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.40.110317
index 12de3ccdac5a..1744ec55fa85 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.40.110317
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.3.40.110317
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=PUEL
@@ -9,4 +9,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.40/Oracle_VM_VirtualBox_Extension_Pack-4.3.40-110317.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.3.40-110317.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=804f1d56e9696552330d2c057e11affc
+_md5_=0b62b77a00a7b3461a01a2780bb0a916
diff --git a/metadata/md5-cache/app-emulation/xen-4.6.3-r2 b/metadata/md5-cache/app-emulation/xen-4.6.3-r2
index b1829d4757c7..0d8b7f3baf26 100644
--- a/metadata/md5-cache/app-emulation/xen-4.6.3-r2
+++ b/metadata/md5-cache/app-emulation/xen-4.6.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=The Xen virtual machine monitor
 EAPI=5
 HOMEPAGE=http://xen.org/
 IUSE=custom-cflags debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.6.3
 REQUIRED_USE=arm? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test splitdebug strip
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.6.3/xen-4.6.3.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.6.3-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-15.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	mount-boot	41ed556fa5641393d5323e421c8e5bcf	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=de96b40b3b10af4761d8160be03fd359
+_md5_=27d63afbfc763c217a2d2d7704dba7f0
diff --git a/metadata/md5-cache/app-forensics/honggfuzz-0.7 b/metadata/md5-cache/app-forensics/honggfuzz-0.7
new file mode 100644
index 000000000000..78302c5bfa73
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/honggfuzz-0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/binutils-libs:= sys-libs/libunwind
+DESCRIPTION=A general purpose fuzzer with feedback support
+EAPI=6
+HOMEPAGE=http://google.github.io/honggfuzz/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/binutils-libs:= sys-libs/libunwind
+SLOT=0
+SRC_URI=https://github.com/google/honggfuzz/archive/0.7.tar.gz -> honggfuzz-0.7.tar.gz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=0fbf07bd19e909ea1a768043c29eee38
diff --git a/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160909 b/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160909
new file mode 100644
index 000000000000..72d2c820ca2d
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160909
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= ) >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-1.1.4
+DESCRIPTION=An experimental grammar fuzzer in Haskell using QuickCheck
+EAPI=6
+HOMEPAGE=http://quickfuzz.org/
+IUSE=archs codes docs imgs media net pki
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/quickfuzz-0.1_p20160909.tar.bz2
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=dcad3661ab35215ca5828af74d3d6289
diff --git a/metadata/md5-cache/app-forensics/quickfuzz-9999 b/metadata/md5-cache/app-forensics/quickfuzz-9999
new file mode 100644
index 000000000000..4249421d2a62
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/quickfuzz-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= ) >=dev-haskell/cabal-1.18.1.3 >=dev-vcs/git-1.8.2.1 >=dev-haskell/cabal-1.1.4
+DESCRIPTION=An experimental grammar fuzzer in Haskell using QuickCheck
+EAPI=6
+HOMEPAGE=http://quickfuzz.org/
+IUSE=archs codes docs imgs media net pki
+LICENSE=GPL-3
+RDEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= )
+SLOT=0
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	git-r3	00f60a84fc7b499c99edfe99caea9f95	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=569c7443e33b8099d41d051db7811136
diff --git a/metadata/md5-cache/app-forensics/radamsa-0.5-r1 b/metadata/md5-cache/app-forensics/radamsa-0.5-r1
new file mode 100644
index 000000000000..d8d1a26bffc8
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/radamsa-0.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A general purpose fuzzer
+EAPI=6
+HOMEPAGE=https://github.com/aoh/radamsa
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aoh/radamsa/releases/download/v0.5/radamsa-0.5.tar.gz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=b0ea7c109bf9fe94202911674cfa2968
diff --git a/metadata/md5-cache/app-forensics/zzuf-0.13-r1 b/metadata/md5-cache/app-forensics/zzuf-0.13-r1
index a88e9bb6fbd9..f9adfe89ed62 100644
--- a/metadata/md5-cache/app-forensics/zzuf-0.13-r1
+++ b/metadata/md5-cache/app-forensics/zzuf-0.13-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Transparent application input fuzzer
 EAPI=4
-HOMEPAGE=http://libcaca.zoy.org/wiki/zzuf/
+HOMEPAGE=http://caca.zoy.org/wiki/zzuf
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=WTFPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://caca.zoy.org/files/zzuf/zzuf-0.13.tar.gz https://dev.gentoo.org/~cardoe/distfiles/zzuf-0.13-zzcat-zzat-rename.patch.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=f3feaf005b5b7d3dca9e5a41c99b5c37
+_md5_=750a3adee0b16f9781b372a8d287d66d
diff --git a/metadata/md5-cache/app-forensics/zzuf-0.15 b/metadata/md5-cache/app-forensics/zzuf-0.15
new file mode 100644
index 000000000000..3a69beb73256
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/zzuf-0.15
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Transparent application input fuzzer
+EAPI=6
+HOMEPAGE=http://caca.zoy.org/wiki/zzuf
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=WTFPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/samhocevar/zzuf/releases/download/v0.15/zzuf-0.15.tar.bz2
+_md5_=388a61c2690a2b543e3a0be3b317b1a7
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.4 b/metadata/md5-cache/app-misc/geoclue-2.4.4
new file mode 100644
index 000000000000..1d39d1d4e367
--- /dev/null
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1 ) zeroconf? ( >=net-dns/avahi-0.6.10 ) !<sci-geosciences/geocode-glib-3.10.0 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=A geoinformation D-Bus service
+EAPI=5
+HOMEPAGE=https://freedesktop.org/wiki/Software/GeoClue
+IUSE=+introspection +modemmanager zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1 ) zeroconf? ( >=net-dns/avahi-0.6.10 ) !<sci-geosciences/geocode-glib-3.10.0
+SLOT=2.0
+SRC_URI=https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.4.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8ddb708a8ffbf7dcb692418fe17aefe1
diff --git a/metadata/md5-cache/app-misc/mtail-1.1.1-r2 b/metadata/md5-cache/app-misc/mtail-1.1.1-r2
deleted file mode 100644
index 5af8c410c663..000000000000
--- a/metadata/md5-cache/app-misc/mtail-1.1.1-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tail workalike, that performs output colourising
-EAPI=3
-HOMEPAGE=http://matt.immute.net/src/mtail/
-KEYWORDS=alpha amd64 ~mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=HPND
-SLOT=0
-SRC_URI=http://matt.immute.net/src/mtail/mtail-1.1.1.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=fafafdd090a606ee6334c40c75626a2f
diff --git a/metadata/md5-cache/app-misc/mtail-1.1.1-r3 b/metadata/md5-cache/app-misc/mtail-1.1.1-r3
index 2dd2dee5cbf9..7bfde6daf663 100644
--- a/metadata/md5-cache/app-misc/mtail-1.1.1-r3
+++ b/metadata/md5-cache/app-misc/mtail-1.1.1-r3
@@ -3,11 +3,11 @@ DESCRIPTION=Tail workalike, that performs output colourising
 EAPI=5
 HOMEPAGE=http://matt.immute.net/src/mtail/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=HPND
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://matt.immute.net/src/mtail/mtail-1.1.1.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=705dfb54b863ae7060d65c275fbab630
+_md5_=081741467b91a71cb0badcc9fc43c353
diff --git a/metadata/md5-cache/app-shells/zsh-completions-0.20.0 b/metadata/md5-cache/app-shells/zsh-completions-0.20.0
new file mode 100644
index 000000000000..194bdd7fcce5
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-completions-0.20.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Additional completion definitions for Zsh
+EAPI=5
+HOMEPAGE=https://github.com/zsh-users/zsh-completions
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-shells/zsh
+SLOT=0
+SRC_URI=https://github.com/zsh-users/zsh-completions/archive/0.20.0.tar.gz -> zsh-completions-0.20.0.tar.gz
+_md5_=850f5752127fe2a4b18b5b1d0bf2bf66
diff --git a/metadata/md5-cache/app-text/aspell-0.60.6.1-r4 b/metadata/md5-cache/app-text/aspell-0.60.6.1-r4
new file mode 100644
index 000000000000..023334c8f9e0
--- /dev/null
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5* virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A spell checker replacement for ispell
+EAPI=6
+HOMEPAGE=http://aspell.net/
+IUSE=nls unicode l10n_af linguas_af l10n_be linguas_be l10n_bg linguas_bg l10n_br linguas_br l10n_ca linguas_ca l10n_cs linguas_cs l10n_cy linguas_cy l10n_da linguas_da l10n_de linguas_de l10n_de-1901 linguas_de_1901 l10n_el linguas_el l10n_en linguas_en l10n_eo linguas_eo l10n_es linguas_es l10n_et linguas_et l10n_fi linguas_fi l10n_fo linguas_fo l10n_fr linguas_fr l10n_ga linguas_ga l10n_gl linguas_gl l10n_he linguas_he l10n_hr linguas_hr l10n_hu linguas_hu l10n_hy linguas_hy l10n_is linguas_is l10n_it linguas_it l10n_la linguas_la l10n_lt linguas_lt l10n_nl linguas_nl l10n_no linguas_no l10n_pl linguas_pl l10n_pt linguas_pt l10n_pt-BR linguas_pt_BR l10n_ro linguas_ro l10n_ru linguas_ru l10n_sk linguas_sk l10n_sl linguas_sl l10n_sr linguas_sr l10n_sv linguas_sv l10n_uk linguas_uk l10n_vi linguas_vi
+KEYWORDS=~alpha ~amd64 ~arm ~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 ~x86-solaris
+LICENSE=LGPL-2
+PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
+RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
+SLOT=0
+SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=8e90dc9f244678a26666e649d8272ef9
diff --git a/metadata/md5-cache/app-text/iso-codes-3.63 b/metadata/md5-cache/app-text/iso-codes-3.63
index c3632167a46b..91418c594e9e 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.63
+++ b/metadata/md5-cache/app-text/iso-codes-3.63
@@ -4,10 +4,10 @@ DESCRIPTION=ISO language, territory, currency, script codes and their translatio
 EAPI=5
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
 IUSE=linguas_af linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_byn linguas_ca linguas_crh linguas_cs linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_ga linguas_gez linguas_gl linguas_gu linguas_haw linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_kok linguas_ku linguas_lt linguas_lv linguas_mi linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nb linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_or linguas_pa linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_ti linguas_tig linguas_tk linguas_tl linguas_tr linguas_tt linguas_tt@iqtelif linguas_ug linguas_uk linguas_ve linguas_vi linguas_wa linguas_wal linguas_wo linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=ia64 sparc
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.63.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=b0da6270414270df179f4c368d9da875
+_md5_=6bec46acbe89ac4ccc9d7366c504f469
diff --git a/metadata/md5-cache/app-text/iso-codes-3.65 b/metadata/md5-cache/app-text/iso-codes-3.70
similarity index 75%
rename from metadata/md5-cache/app-text/iso-codes-3.65
rename to metadata/md5-cache/app-text/iso-codes-3.70
index 7d0ada0b62c1..1ea726f2d170 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.65
+++ b/metadata/md5-cache/app-text/iso-codes-3.70
@@ -1,13 +1,13 @@
-DEFINED_PHASES=prepare
-DEPEND=app-arch/xz-utils sys-devel/gettext
+DEFINED_PHASES=prepare setup
+DEPEND=|| ( dev-lang/python:3.5 dev-lang/python:3.4 ) app-arch/xz-utils sys-devel/gettext
 DESCRIPTION=ISO language, territory, currency, script codes and their translations
-EAPI=5
+EAPI=6
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
 IUSE=linguas_af linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_byn linguas_ca linguas_crh linguas_cs linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_ga linguas_gez linguas_gl linguas_gu linguas_haw linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_kok linguas_ku linguas_lt linguas_lv linguas_mi linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nb linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_or linguas_pa linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_ti linguas_tig linguas_tk linguas_tl linguas_tr linguas_tt linguas_tt@iqtelif linguas_ug linguas_uk linguas_ve linguas_vi linguas_wa linguas_wal linguas_wo linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.65.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=61395f4d64110b49a6e6bd105995c79e
+SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.70.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=d9bff83e69941b3fa9a3f4f1641ae7f5
diff --git a/metadata/md5-cache/app-text/rpl-1.5.5 b/metadata/md5-cache/app-text/rpl-1.5.5
deleted file mode 100644
index d062c9c155f3..000000000000
--- a/metadata/md5-cache/app-text/rpl-1.5.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Intelligent recursive search/replace utility
-EAPI=3
-HOMEPAGE=http://rpl.sourceforge.net/
-KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/rpl/rpl-1.5.5.tar.gz
-_eclasses_=distutils	ad9e4720eb3e69090dd968b152fc611b	multilib	165fc17c38d1b11dac2008280dab6e80	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=f1fcf2ed052ad1aff7afcb53f25398d3
diff --git a/metadata/md5-cache/app-text/rpl-1.5.5-r1 b/metadata/md5-cache/app-text/rpl-1.5.5-r1
index ca8c7f0d0309..11fe2e7f44b5 100644
--- a/metadata/md5-cache/app-text/rpl-1.5.5-r1
+++ b/metadata/md5-cache/app-text/rpl-1.5.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Intelligent recursive search/replace utility
 EAPI=5
 HOMEPAGE=http://rpl.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rpl/rpl-1.5.5.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=041fad471ff58c664db2be0feea239e7
+_md5_=e364d8a823d2bc8d96ddb8b31def6bbb
diff --git a/metadata/md5-cache/app-text/sigil-0.9.5-r1 b/metadata/md5-cache/app-text/sigil-0.9.5-r2
similarity index 96%
rename from metadata/md5-cache/app-text/sigil-0.9.5-r1
rename to metadata/md5-cache/app-text/sigil-0.9.5-r2
index 705599ab326b..f948cf476ba9 100644
--- a/metadata/md5-cache/app-text/sigil-0.9.5-r1
+++ b/metadata/md5-cache/app-text/sigil-0.9.5-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 sys-libs/zlib[minizip] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 app-arch/unzip sys-devel/make >=dev-util/cmake-3.0
+DEPEND=app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtwidgets-5.4:5 sys-libs/zlib[minizip] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 app-arch/unzip sys-devel/make >=dev-util/cmake-3.0
 DESCRIPTION=Sigil is a multi-platform WYSIWYG ebook editor for ePub format
 EAPI=6
 HOMEPAGE=http://sigil-ebook.com/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 sys-libs/zlib[minizip]
+RDEPEND=app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtwidgets-5.4:5 sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/releases/download/0.9.5/Sigil-0.9.5-Code.zip
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6a976e3202fb015d90a3c20d86163169
+_md5_=78126165f1b66a17ee43e0441b3802cb
diff --git a/metadata/md5-cache/app-text/sigil-0.9.6 b/metadata/md5-cache/app-text/sigil-0.9.6
new file mode 100644
index 000000000000..679ae041cdcc
--- /dev/null
+++ b/metadata/md5-cache/app-text/sigil-0.9.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtwidgets-5.4:5 sys-libs/zlib[minizip] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 app-arch/unzip sys-devel/make >=dev-util/cmake-3.0
+DESCRIPTION=Sigil is a multi-platform WYSIWYG ebook editor for ePub format
+EAPI=6
+HOMEPAGE=http://sigil-ebook.com/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtwidgets-5.4:5 sys-libs/zlib[minizip]
+SLOT=0
+SRC_URI=https://github.com/Sigil-Ebook/Sigil/releases/download/0.9.6/Sigil-0.9.6-Code.zip
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=78126165f1b66a17ee43e0441b3802cb
diff --git a/metadata/md5-cache/app-text/tesseract-3.04.00-r4 b/metadata/md5-cache/app-text/tesseract-3.04.00-r4
deleted file mode 100644
index 3f2ed71a9edc..000000000000
--- a/metadata/md5-cache/app-text/tesseract-3.04.00-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) scrollview? ( >=virtual/jdk-1.7 ) !<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 scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An OCR Engine, orginally developed at HP, now open source.
-EAPI=5
-HOMEPAGE=https://github.com/tesseract-ocr
-IUSE=doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW elibc_FreeBSD scrollview
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) scrollview? ( >=virtual/jre-1.7 ) scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/3.04.00.tar.gz -> tesseract-3.04.00.tar.gz https://github.com/tesseract-ocr/tessdata/raw/3.04.00/eng.traineddata -> eng.traineddata-3.04.00 doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz ) math? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/equ.traineddata -> equ.traineddata-3.04.00 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ara.traineddata -> ara.traineddata-3.04.00 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/bul.traineddata -> bul.traineddata-3.04.00 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/cat.traineddata -> cat.traineddata-3.04.00 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chr.traineddata -> chr.traineddata-3.04.00 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ces.traineddata -> ces.traineddata-3.04.00 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/deu.traineddata -> deu.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/deu_frak.traineddata -> deu_frak.traineddata-3.04.00 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/dan.traineddata -> dan.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/dan_frak.traineddata -> dan_frak.traineddata-3.04.00 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ell.traineddata -> ell.traineddata-3.04.00 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/spa.traineddata -> spa.traineddata-3.04.00 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/fin.traineddata -> fin.traineddata-3.04.00 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/fra.traineddata -> fra.traineddata-3.04.00 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/heb.traineddata -> heb.traineddata-3.04.00 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/hin.traineddata -> hin.traineddata-3.04.00 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/hun.traineddata -> hun.traineddata-3.04.00 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ind.traineddata -> ind.traineddata-3.04.00 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ita.traineddata -> ita.traineddata-3.04.00 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/jpn.traineddata -> jpn.traineddata-3.04.00 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/kor.traineddata -> kor.traineddata-3.04.00 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/lit.traineddata -> lit.traineddata-3.04.00 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/lav.traineddata -> lav.traineddata-3.04.00 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/nld.traineddata -> nld.traineddata-3.04.00 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/nor.traineddata -> nor.traineddata-3.04.00 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/pol.traineddata -> pol.traineddata-3.04.00 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/por.traineddata -> por.traineddata-3.04.00 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ron.traineddata -> ron.traineddata-3.04.00 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/rus.traineddata -> rus.traineddata-3.04.00 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slk.traineddata -> slk.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slk_frak.traineddata -> slk_frak.traineddata-3.04.00 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slv.traineddata -> slv.traineddata-3.04.00 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/srp.traineddata -> srp.traineddata-3.04.00 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/swe.traineddata -> swe.traineddata-3.04.00 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tha.traineddata -> tha.traineddata-3.04.00 ) l10n_tl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tgl.traineddata -> tgl.traineddata-3.04.00 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tur.traineddata -> tur.traineddata-3.04.00 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ukr.traineddata -> ukr.traineddata-3.04.00 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/vie.traineddata -> vie.traineddata-3.04.00 ) l10n_zh-CN? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chi_sim.traineddata -> chi_sim.traineddata-3.04.00 ) l10n_zh-TW? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chi_tra.traineddata -> chi_tra.traineddata-3.04.00 ) osd? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/osd.traineddata -> osd.traineddata-3.04.00 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c66522df8ac19fb828de7f8173565f14
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-2.38.1 b/metadata/md5-cache/dev-cpp/libxmlpp-3.0.0
similarity index 77%
rename from metadata/md5-cache/dev-cpp/libxmlpp-2.38.1
rename to metadata/md5-cache/dev-cpp/libxmlpp-3.0.0
index a7219b30acbd..3b8ef0fec2ee 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-2.38.1
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-3.0.0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/libxml2-2.7.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/libxml2-2.7.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=C++ wrapper for the libxml2 XML parser library
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libxmlplusplus.sourceforge.net/
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2.6
-SRC_URI=mirror://gnome/sources/libxml++/2.38/libxml++-2.38.1.tar.xz
+SLOT=3.0
+SRC_URI=mirror://gnome/sources/libxml++/3.0/libxml++-3.0.0.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=790365dd6085be0cbe8c456a7a7974b0
+_md5_=a371ebec4a42c1238db785cabcf45305
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.3 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.3
new file mode 100644
index 000000000000..e6326300a533
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=In-memory cache Erlang and Elixir library
+EAPI=6
+HOMEPAGE=https://github.com/processone/cache_tab
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/cache_tab/archive/1.0.3.tar.gz -> cache_tab-1.0.3.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=51c65696a98bd514b8e6b586f82f76c5
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.4 b/metadata/md5-cache/dev-erlang/esip-1.0.4
index 2ea74994e084..87cc33bab662 100644
--- a/metadata/md5-cache/dev-erlang/esip-1.0.4
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.4
@@ -9,4 +9,4 @@ RDEPEND=>=dev-erlang/fast_tls-1.0.0 >=dev-erlang/stun-1.0.0 >=dev-erlang/p1_util
 SLOT=0
 SRC_URI=https://github.com/processone/esip/archive/1.0.4.tar.gz -> esip-1.0.4.tar.gz
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=35e0206c9b0cd4b65bfbb5fb45c6e77a
+_md5_=7411fdd53c20f992d5fb3823e4d79f6a
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.7 b/metadata/md5-cache/dev-erlang/esip-1.0.7
new file mode 100644
index 000000000000..163449e0a5a5
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/stun-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=ProcessOne SIP server component
+EAPI=6
+HOMEPAGE=https://github.com/processone/esip
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/stun-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/esip/archive/1.0.7.tar.gz -> esip-1.0.7.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=80767decb23999de77d933267546f6fb
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.0.6 b/metadata/md5-cache/dev-erlang/fast_tls-1.0.6
new file mode 100644
index 000000000000..9c262e8df815
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_tls
+IUSE=libressl
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_tls/archive/1.0.6.tar.gz -> fast_tls-1.0.6.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=3db7473f185fc3cc9ca6bbaba497f23b
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.14 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.14
new file mode 100644
index 000000000000..1228dff0d1fc
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-libs/expat test? ( >=dev-lang/elixir-1.1 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Expat based Erlang XML parsing library
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_xml
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-libs/expat dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_xml/archive/1.1.14.tar.gz -> fast_xml-1.1.14.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=6d63fb7b06bfbc7df792f16096f93207
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.5 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.5
new file mode 100644
index 000000000000..6fa4afed608c
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Yaml native library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_yaml
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.5.tar.gz -> fast_yaml-1.0.5.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=41e4a5abcaee4544d6a4411f871d76d1
diff --git a/metadata/md5-cache/dev-erlang/goldrush-0.1.8.1 b/metadata/md5-cache/dev-erlang/goldrush-0.1.8.1
index 7191b948bd4d..b056ca7e5710 100644
--- a/metadata/md5-cache/dev-erlang/goldrush-0.1.8.1
+++ b/metadata/md5-cache/dev-erlang/goldrush-0.1.8.1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/DeadZen/goldrush/archive/0.1.8-1.tar.gz -> goldrush-0.1.8.1.tar.gz
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=90dca901d214afbf55270e8b40b7582e
+_md5_=90d3df33d74b5f1e523d859ae84126c8
diff --git a/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709 b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
new file mode 100644
index 000000000000..1cae1efb79d5
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/proper-1.2 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang port of Hamcrest
+EAPI=6
+HOMEPAGE=https://github.com/hyperthunk/hamcrest-erlang
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=910bd024c90042124b7b226e76857da2
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.1 b/metadata/md5-cache/dev-erlang/iconv-1.0.1
new file mode 100644
index 000000000000..aaf387cffe64
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/iconv-1.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/iconv
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/iconv/archive/1.0.1.tar.gz -> iconv-1.0.1.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=8778d8d7d1b6cf1aed03e1155d1d4de1
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.0 b/metadata/md5-cache/dev-erlang/lager-3.2.0
index 8b8d687bc614..a95ede2598ad 100644
--- a/metadata/md5-cache/dev-erlang/lager-3.2.0
+++ b/metadata/md5-cache/dev-erlang/lager-3.2.0
@@ -9,4 +9,4 @@ RDEPEND=>=dev-erlang/goldrush-0.1.7 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/lager/archive/3.2.0.tar.gz -> lager-3.2.0.tar.gz
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=bc82aa4bb747f6ce7149e2d6d27d1df1
+_md5_=911e6275abd6f5030f7367b31d339173
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.1 b/metadata/md5-cache/dev-erlang/lager-3.2.1
new file mode 100644
index 000000000000..538b3d684a88
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/lager-3.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Logging framework for Erlang/OTP
+EAPI=6
+HOMEPAGE=https://github.com/basho/lager
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/basho/lager/archive/3.2.1.tar.gz -> lager-3.2.1.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=01a709be368472a8e2da97b48c748f21
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.5 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.5
new file mode 100644
index 000000000000..851267e1e5ad
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang utility modules from ProcessOne
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_utils
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/p1_utils/archive/1.0.5.tar.gz -> p1_utils-1.0.5.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=d20b94c7a232615195efa3cfb0167bd8
diff --git a/metadata/md5-cache/dev-erlang/proper-1.2 b/metadata/md5-cache/dev-erlang/proper-1.2
new file mode 100644
index 000000000000..a7e523c34c0b
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/proper-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=QuickCheck-inspired property-based testing tool for Erlang
+EAPI=6
+HOMEPAGE=https://github.com/manopapad/proper
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/manopapad/proper/archive/v1.2.tar.gz -> proper-1.2.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=9df871bf9d82624143b3bb5055ea296e
diff --git a/metadata/md5-cache/dev-erlang/protobuffs-0.9.0 b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
new file mode 100644
index 000000000000..26d18600b997
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.2 >=dev-erlang/proper-1.1 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Google's Protocol Buffers for Erlang
+EAPI=6
+HOMEPAGE=https://github.com/basho/erlang_protobuffs
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/basho/erlang_protobuffs/archive/0.9.0.tar.gz -> protobuffs-0.9.0.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=5e64800890bb0a5291c9848cfdf3d299
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2 b/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2
new file mode 100644
index 000000000000..9fa554bdde19
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Riak Protocol Buffers messages
+EAPI=6
+HOMEPAGE=https://github.com/basho/riak_pb
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/basho/riak_pb/archive/2.1.4.2.tar.gz -> riak_pb-2.1.4.2.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=0b226fb5b32928d282114fc9dc4eafad
diff --git a/metadata/md5-cache/dev-erlang/riakc-2.1.1_p20151111 b/metadata/md5-cache/dev-erlang/riakc-2.1.1_p20151111
index d566fc8c9e1b..bf8d982e1cfc 100644
--- a/metadata/md5-cache/dev-erlang/riakc-2.1.1_p20151111
+++ b/metadata/md5-cache/dev-erlang/riakc-2.1.1_p20151111
@@ -9,4 +9,4 @@ RDEPEND=>=dev-erlang/riak_pb-2.1.0.7 >=dev-lang/erlang-17.1 <dev-lang/erlang-19
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/dev-erlang/riakc/riakc-2.1.1_p20151111.tar.gz
 _eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
-_md5_=f5929d7fa4da23988b7ec19a87fa9528
+_md5_=e1f3970e7120e1df8a18a807175b79bd
diff --git a/metadata/md5-cache/dev-erlang/riakc-2.4.1 b/metadata/md5-cache/dev-erlang/riakc-2.4.1
new file mode 100644
index 000000000000..94062e7db182
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/riakc-2.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/riak_pb-2.1.4.1 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang clients for Riak
+EAPI=6
+HOMEPAGE=https://github.com/basho/riak-erlang-client
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/riak_pb-2.1.4.1 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/basho/riak-erlang-client/archive/2.4.1.tar.gz -> riakc-2.4.1.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=fc4fc8410a831eaf9a9e627dee8cbe35
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.5 b/metadata/md5-cache/dev-erlang/stringprep-1.0.5
new file mode 100644
index 000000000000..a7cd053d5e24
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/stringprep
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 tcltk
+RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/stringprep/archive/1.0.5.tar.gz -> stringprep-1.0.5.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=524bf49e869db441ca264425a41fe1d9
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.6 b/metadata/md5-cache/dev-erlang/stun-1.0.6
new file mode 100644
index 000000000000..c483d240428d
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=STUN and TURN library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/stun
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/stun/archive/1.0.6.tar.gz -> stun-1.0.6.tar.gz
+_eclasses_=rebar	98c3519ff55e51c3d222cde7f9f5d2e9
+_md5_=1f9632522a9cf5dee84ac48a2ba1f7be
diff --git a/metadata/md5-cache/dev-games/irrlicht-1.8.4 b/metadata/md5-cache/dev-games/irrlicht-1.8.4
new file mode 100644
index 000000000000..014cdc81269d
--- /dev/null
+++ b/metadata/md5-cache/dev-games/irrlicht-1.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=virtual/jpeg:0 media-libs/libpng:0= app-arch/bzip2 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm app-arch/unzip x11-proto/xproto x11-proto/xf86vidmodeproto
+DESCRIPTION=open source high performance realtime 3D engine written in C++
+EAPI=6
+HOMEPAGE=http://irrlicht.sourceforge.net/
+IUSE=debug doc static-libs
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=ZLIB
+RDEPEND=virtual/jpeg:0 media-libs/libpng:0= app-arch/bzip2 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=mirror://sourceforge/irrlicht/irrlicht-1.8.4.zip
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=473c463d1d5900b121468f9ae18e3563
diff --git a/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1 b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
new file mode 100644
index 000000000000..3cf69fc51068
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Trivial package for writing PPM images
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/AC-PPM
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.1
+SRC_URI=mirror://hackage/packages/archive/AC-PPM/1.1.1/AC-PPM-1.1.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2594e7969f8c4aa02c49180550408f91
diff --git a/metadata/md5-cache/dev-haskell/argparser-0.3.4 b/metadata/md5-cache/dev-haskell/argparser-0.3.4
new file mode 100644
index 000000000000..900dcf2e7b2f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/argparser-0.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >dev-haskell/htf-0.9 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Command line parsing framework for console applications
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/argparser
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.3.4
+SRC_URI=mirror://hackage/packages/archive/argparser/0.3.4/argparser-0.3.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f6a3fcf2fe79c473a35eb43b34809968
diff --git a/metadata/md5-cache/dev-haskell/arithmoi-0.4.2.0 b/metadata/md5-cache/dev-haskell/arithmoi-0.4.2.0
new file mode 100644
index 000000000000..a05b612dfb76
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/arithmoi-0.4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9 >=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Efficient basic number-theoretic functions. Primes, powers, integer logarithms
+EAPI=6
+HOMEPAGE=https://github.com/cartazio/arithmoi
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.2.0
+SRC_URI=mirror://hackage/packages/archive/arithmoi/0.4.2.0/arithmoi-0.4.2.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2c44a7890bba18c0bf167ac27396b281
diff --git a/metadata/md5-cache/dev-haskell/base-orphans-0.5.4 b/metadata/md5-cache/dev-haskell/base-orphans-0.5.4
new file mode 100644
index 000000000000..03ec96d6ad4c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base-orphans-0.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Backwards-compatible orphan instances for base
+EAPI=6
+HOMEPAGE=https://github.com/haskell-compat/base-orphans#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.4
+SRC_URI=mirror://hackage/packages/archive/base-orphans/0.5.4/base-orphans-0.5.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7b0eb9c09bb047f420da40013de99e26
diff --git a/metadata/md5-cache/dev-haskell/bitwise-0.1.1.1 b/metadata/md5-cache/dev-haskell/bitwise-0.1.1.1
new file mode 100644
index 000000000000..7227031744e0
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bitwise-0.1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=fast multi-dimensional unboxed bit packed Bool arrays
+EAPI=6
+HOMEPAGE=http://code.mathr.co.uk/bitwise
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1.1
+SRC_URI=mirror://hackage/packages/archive/bitwise/0.1.1.1/bitwise-0.1.1.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=eb9beec6c0745c0caf345152b36b0619
diff --git a/metadata/md5-cache/dev-haskell/boolean-0.2.3 b/metadata/md5-cache/dev-haskell/boolean-0.2.3
new file mode 100644
index 000000000000..79e04923ee09
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/boolean-0.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Generalized booleans and numbers
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/Boolean
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.3
+SRC_URI=mirror://hackage/packages/archive/Boolean/0.2.3/Boolean-0.2.3.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=83c9fc10bf7433ed15d36cfe40a583a9
diff --git a/metadata/md5-cache/dev-haskell/bytes-0.15.2 b/metadata/md5-cache/dev-haskell/bytes-0.15.2
new file mode 100644
index 000000000000..c0cb971c8a71
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bytes-0.15.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Sharing code for serialization between binary and cereal
+EAPI=5
+HOMEPAGE=https://github.com/ekmett/bytes
+IUSE=+test-doctests doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.15.2
+SRC_URI=mirror://hackage/packages/archive/bytes/0.15.2/bytes-0.15.2.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=49159c4fef36d2f3eae85d49b96cbfc9
diff --git a/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.4 b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.4
new file mode 100644
index 000000000000..4a2a28a2ec8b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.1.2 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=ByteString-backed Handles
+EAPI=6
+HOMEPAGE=http://hub.darcs.net/ganesh/bytestring-handle
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.4
+SRC_URI=mirror://hackage/packages/archive/bytestring-handle/0.1.0.4/bytestring-handle-0.1.0.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b47d3ba90b73cc1b03a9cdb6f136e3cd
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.20.2 b/metadata/md5-cache/dev-haskell/cpphs-1.20.2
new file mode 100644
index 000000000000..3d3a29e61104
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.20.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A liberalised re-implementation of cpp, the C pre-processor
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/cpphs/
+IUSE=doc hscolour profile
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.20.2
+SRC_URI=mirror://hackage/packages/archive/cpphs/1.20.2/cpphs-1.20.2.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=40ebc25e3ebd1e54c6ea3636682614fd
diff --git a/metadata/md5-cache/dev-haskell/data-accessor-0.2.2.7 b/metadata/md5-cache/dev-haskell/data-accessor-0.2.2.7
new file mode 100644
index 000000000000..5119d29e6aef
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/data-accessor-0.2.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Utilities for accessing and manipulating fields of records
+EAPI=5
+HOMEPAGE=http://www.haskell.org/haskellwiki/Record_access
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.2.7
+SRC_URI=mirror://hackage/packages/archive/data-accessor/0.2.2.7/data-accessor-0.2.2.7.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c2dac6b72b6ec9c51cdc7b2bc0ee7fe4
diff --git a/metadata/md5-cache/dev-haskell/derive-2.5.26 b/metadata/md5-cache/dev-haskell/derive-2.5.26
new file mode 100644
index 000000000000..df7efce8ae43
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/derive-2.5.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A program and library to derive instances for data types
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/derive#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.5.26
+SRC_URI=mirror://hackage/packages/archive/derive/2.5.26/derive-2.5.26.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5900527e5e65ca61bd645d1c9d3399db
diff --git a/metadata/md5-cache/dev-haskell/extra-1.4.10 b/metadata/md5-cache/dev-haskell/extra-1.4.10
new file mode 100644
index 000000000000..631aa1e21055
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/extra-1.4.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Extra functions I use
+EAPI=6
+HOMEPAGE=https://github.com/ndmitchell/extra#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=2/1.4.10
+SRC_URI=mirror://hackage/packages/archive/extra/1.4.10/extra-1.4.10.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=25ade0380fcbf58270b681210b0fdeca
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
new file mode 100644
index 000000000000..b4536fff1062
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl dev-haskell/pretty-show >=dev-haskell/smallcheck-1.0 dev-haskell/syb >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.17.1
+SRC_URI=mirror://hackage/packages/archive/haskell-src-exts/1.17.1/haskell-src-exts-1.17.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7846331310de70e4ca4bab3c95f2cf8d
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-meta-0.6.0.14-r1 b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.6.0.14-r1
new file mode 100644
index 000000000000..9353bd946e30
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.6.0.14-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?] >=dev-lang/ghc-7.8.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Parse source to template-haskell abstract syntax
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/haskell-src-meta
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?] >=dev-lang/ghc-7.8.1:=
+SLOT=0/0.6.0.14
+SRC_URI=mirror://hackage/packages/archive/haskell-src-meta/0.6.0.14/haskell-src-meta-0.6.0.14.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1d50e16d42ea9cfcbc449b8838e8b69c
diff --git a/metadata/md5-cache/dev-haskell/hcg-minus-0.15 b/metadata/md5-cache/dev-haskell/hcg-minus-0.15
new file mode 100644
index 000000000000..eb5190aa67a5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hcg-minus-0.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/colour:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=haskell cg (minus)
+EAPI=6
+HOMEPAGE=http://rd.slavepianos.org/t/hcg-minus
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/colour:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.15
+SRC_URI=mirror://hackage/packages/archive/hcg-minus/0.15/hcg-minus-0.15.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a3728deaa888a14f5059621f8f1255cc
diff --git a/metadata/md5-cache/dev-haskell/hcodecs-0.5 b/metadata/md5-cache/dev-haskell/hcodecs-0.5
new file mode 100644
index 000000000000..421c8a56a3ce
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hcodecs-0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/quickcheck-2.0:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files
+EAPI=5
+HOMEPAGE=http://www-db.informatik.uni-tuebingen.de/team/giorgidze
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/quickcheck-2.0:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.5
+SRC_URI=mirror://hackage/packages/archive/HCodecs/0.5/HCodecs-0.5.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e5f7309c43d346a740e3599396a77b63
diff --git a/metadata/md5-cache/dev-haskell/hlint-1.9.35 b/metadata/md5-cache/dev-haskell/hlint-1.9.35
new file mode 100644
index 000000000000..1dc28d67c545
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hlint-1.9.35
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/extra-1.4.9:2=[profile?] >=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/refact-0.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Source code suggestions
+EAPI=5
+HOMEPAGE=https://github.com/ndmitchell/hlint#readme
+IUSE=emacs +gpl doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/extra-1.4.9:2=[profile?] >=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/refact-0.3:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] >=dev-lang/ghc-7.4.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
+SLOT=0/1.9.35
+SRC_URI=mirror://hackage/packages/archive/hlint/1.9.35/hlint-1.9.35.tar.gz
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=fe62ad3fa5d7bbc37f4c1ee2384d5561
diff --git a/metadata/md5-cache/dev-haskell/hps-0.15 b/metadata/md5-cache/dev-haskell/hps-0.15
new file mode 100644
index 000000000000..8a520e4bc5ff
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hps-0.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Haskell Postscript
+EAPI=6
+HOMEPAGE=http://rd.slavepianos.org/?t=hps
+IUSE=build-exec doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] )
+SLOT=0/0.15
+SRC_URI=mirror://hackage/packages/archive/hps/0.15/hps-0.15.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a980de5751d46826be2caf9fab223cc7
diff --git a/metadata/md5-cache/dev-haskell/htf-0.13.1.0 b/metadata/md5-cache/dev-haskell/htf-0.13.1.0
new file mode 100644
index 000000000000..1d6e1c3b54a5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/htf-0.13.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/cpphs-1.19:=[profile?] >=dev-haskell/diff-0.3:=[profile?] dev-haskell/haskell-src:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-compat-0.92:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/xmlgen-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/aeson-pretty >=dev-haskell/temporary-1.1 >=dev-haskell/unordered-containers-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=The Haskell Test Framework
+EAPI=5
+HOMEPAGE=https://github.com/skogsbaer/HTF/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/cpphs-1.19:=[profile?] >=dev-haskell/diff-0.3:=[profile?] dev-haskell/haskell-src:=[profile?] >=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-compat-0.92:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/xmlgen-0.6:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.13.1.0
+SRC_URI=mirror://hackage/packages/archive/HTF/0.13.1.0/HTF-0.13.1.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6214f8e3c29050cd9cc0bd6280a6238d
diff --git a/metadata/md5-cache/dev-haskell/icalendar-0.4.0.3 b/metadata/md5-cache/dev-haskell/icalendar-0.4.0.3
new file mode 100644
index 000000000000..96d468c8ac55
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/icalendar-0.4.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=iCalendar data types, parser, and printer
+EAPI=6
+HOMEPAGE=https://github.com/chrra/iCalendar
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.4.0.3
+SRC_URI=mirror://hackage/packages/archive/iCalendar/0.4.0.3/iCalendar-0.4.0.3.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=219e6c8669d53960901df34c55b6ecde
diff --git a/metadata/md5-cache/dev-haskell/idiii-0.1.3.3 b/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
new file mode 100644
index 000000000000..2d8bc8145a5f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] dev-haskell/polyparse:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=ID3v2 (tagging standard for MP3 files) library
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/idiii
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] dev-haskell/polyparse:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.1.3.3
+SRC_URI=mirror://hackage/packages/archive/idiii/0.1.3.3/idiii-0.1.3.3.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e28a14066fb298ffc4ff15198bf7bcb8
diff --git a/metadata/md5-cache/dev-haskell/language-bash-0.6.1 b/metadata/md5-cache/dev-haskell/language-bash-0.6.1
new file mode 100644
index 000000000000..779c3a1bc700
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-bash-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Parsing and pretty-printing Bash shell scripts
+EAPI=6
+HOMEPAGE=https://github.com/knrafto/language-bash/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.6.1
+SRC_URI=mirror://hackage/packages/archive/language-bash/0.6.1/language-bash-0.6.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=06feffbbb8a07311c47a48a622e837c7
diff --git a/metadata/md5-cache/dev-haskell/language-css-0.0.3 b/metadata/md5-cache/dev-haskell/language-css-0.0.3
new file mode 100644
index 000000000000..970690644f04
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-css-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=CSS 2.1 syntax
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/language-css
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.3
+SRC_URI=mirror://hackage/packages/archive/language-css/0.0.3/language-css-0.0.3.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=66a328eb7349a2e088ef832071cb1dbd
diff --git a/metadata/md5-cache/dev-haskell/language-dot-0.1.0 b/metadata/md5-cache/dev-haskell/language-dot-0.1.0
new file mode 100644
index 000000000000..e2fad6fe2b71
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-dot-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A library for the analysis and creation of Graphviz DOT files
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/language-dot
+IUSE=+executable doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+SLOT=0/0.1.0
+SRC_URI=mirror://hackage/packages/archive/language-dot/0.1.0/language-dot-0.1.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=935a24d23cb1e5b6488594a8a2cb5aed
diff --git a/metadata/md5-cache/dev-haskell/language-ecmascript-0.17.1.0-r1 b/metadata/md5-cache/dev-haskell/language-ecmascript-0.17.1.0-r1
new file mode 100644
index 000000000000..ed93ff2cbf70
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-ecmascript-0.17.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/testing-feat-0.4.0.2:=[profile?] <dev-haskell/testing-feat-0.5:=[profile?] >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=JavaScript parser and pretty-printer library
+EAPI=5
+HOMEPAGE=https://github.com/jswebtools/language-ecmascript
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/testing-feat-0.4.0.2:=[profile?] <dev-haskell/testing-feat-0.5:=[profile?] >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.17.1.0
+SRC_URI=mirror://hackage/packages/archive/language-ecmascript/0.17.1.0/language-ecmascript-0.17.1.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=96df8e70d7e61e6df1e07dd304013116
diff --git a/metadata/md5-cache/dev-haskell/language-glsl-0.2.0 b/metadata/md5-cache/dev-haskell/language-glsl-0.2.0
new file mode 100644
index 000000000000..193f27c8395b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-glsl-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=GLSL abstract syntax tree, parser, and pretty-printer
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/language-glsl
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/language-glsl/0.2.0/language-glsl-0.2.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1375c623b2ffaccf72dbd22dda17028e
diff --git a/metadata/md5-cache/dev-haskell/language-lua-0.10.0 b/metadata/md5-cache/dev-haskell/language-lua-0.10.0
new file mode 100644
index 000000000000..3a86d266790b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-lua-0.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Lua parser and pretty-printer
+EAPI=6
+HOMEPAGE=https://github.com/glguy/language-lua
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:=
+SLOT=0/0.10.0
+SRC_URI=mirror://hackage/packages/archive/language-lua/0.10.0/language-lua-0.10.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=db0bc4a162ecaceb8974eb1475f6c20e
diff --git a/metadata/md5-cache/dev-haskell/language-python-0.5.4 b/metadata/md5-cache/dev-haskell/language-python-0.5.4
new file mode 100644
index 000000000000..450e28df75a5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-python-0.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Parsing and pretty printing of Python code
+EAPI=6
+HOMEPAGE=https://github.com/bjpop/language-python
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.5.4
+SRC_URI=mirror://hackage/packages/archive/language-python/0.5.4/language-python-0.5.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8a2161490c9b11333af42f631ddbf4fa
diff --git a/metadata/md5-cache/dev-haskell/linear-1.20.5 b/metadata/md5-cache/dev-haskell/linear-1.20.5
new file mode 100644
index 000000000000..e71f59c0b02e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/linear-1.20.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.12 >=dev-haskell/hunit-1.2.5 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/test-framework-0.8 >=dev-haskell/test-framework-hunit-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Linear Algebra
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/linear/
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.20.5
+SRC_URI=mirror://hackage/packages/archive/linear/1.20.5/linear-1.20.5.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6d2dcaada8fae0c10f70d83ca7fd793a
diff --git a/metadata/md5-cache/dev-haskell/memotrie-0.6.4 b/metadata/md5-cache/dev-haskell/memotrie-0.6.4
new file mode 100644
index 000000000000..db4290a64712
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/memotrie-0.6.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Trie-based memo functions
+EAPI=5
+HOMEPAGE=https://github.com/conal/MemoTrie
+IUSE=examples profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.4
+SRC_URI=mirror://hackage/packages/archive/MemoTrie/0.6.4/MemoTrie-0.6.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=db21d96f137d7edecb5646f157ceb283
diff --git a/metadata/md5-cache/dev-haskell/mime-0.4.0.2 b/metadata/md5-cache/dev-haskell/mime-0.4.0.2
new file mode 100644
index 000000000000..8a907b91e699
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/mime-0.4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Working with MIME types
+EAPI=5
+HOMEPAGE=https://github.com/GaloisInc/mime
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.2
+SRC_URI=mirror://hackage/packages/archive/mime/0.4.0.2/mime-0.4.0.2.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c75fc61c8d2849675a1931bf9c2163f1
diff --git a/metadata/md5-cache/dev-haskell/numinstances-1.4 b/metadata/md5-cache/dev-haskell/numinstances-1.4
new file mode 100644
index 000000000000..cee8f133fe8d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/numinstances-1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Instances of numeric classes for functions and tuples
+EAPI=5
+HOMEPAGE=https://github.com/conal/NumInstances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4
+SRC_URI=mirror://hackage/packages/archive/NumInstances/1.4/NumInstances-1.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a39533c0a247837b7970dc60d6427ea7
diff --git a/metadata/md5-cache/dev-haskell/refact-0.3.0.2 b/metadata/md5-cache/dev-haskell/refact-0.3.0.2
new file mode 100644
index 000000000000..b77c94b3475e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/refact-0.3.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Specify refactorings to perform with apply-refact
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/refact
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.0.2
+SRC_URI=mirror://hackage/packages/archive/refact/0.3.0.2/refact-0.3.0.2.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f1105c1368f41438e934d7b23043d017
diff --git a/metadata/md5-cache/dev-haskell/riff-0.3.0.1 b/metadata/md5-cache/dev-haskell/riff-0.3.0.1
new file mode 100644
index 000000000000..5c4faadf244a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/riff-0.3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/either-4.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=RIFF parser for Haskell
+EAPI=6
+HOMEPAGE=https://bitbucket.org/robertmassaioli/riff/overview
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/either-4.3:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/0.3.0.1
+SRC_URI=mirror://hackage/packages/archive/riff/0.3.0.1/riff-0.3.0.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=004b240111d4d33cbf844485c5ff5fc6
diff --git a/metadata/md5-cache/dev-haskell/shell-escape-0.2.0 b/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
new file mode 100644
index 000000000000..368137c07e12
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/vector-0.6.0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Shell escaping library
+EAPI=6
+HOMEPAGE=https://github.com/solidsnack/shell-escape
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/vector-0.6.0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0
+SRC_URI=mirror://hackage/packages/archive/shell-escape/0.2.0/shell-escape-0.2.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6bd199317d56b0c2228a1ee8ec1cb695
diff --git a/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1 b/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
new file mode 100644
index 000000000000..c012acba7927
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A toy module to temporarily redirect a program's stdout
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/system-posix-redirect
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.1.0.1
+SRC_URI=mirror://hackage/packages/archive/system-posix-redirect/1.1.0.1/system-posix-redirect-1.1.0.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=84a3642329cc411d288202dcd94916df
diff --git a/metadata/md5-cache/dev-haskell/tagshare-0.0 b/metadata/md5-cache/dev-haskell/tagshare-0.0
new file mode 100644
index 000000000000..1ff523e8eb88
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tagshare-0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-lang/ghc-7.4.2:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=TagShare - explicit sharing with tags
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/tagshare
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-lang/ghc-7.4.2:=
+SLOT=0/0.0
+SRC_URI=mirror://hackage/packages/archive/tagshare/0.0/tagshare-0.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a776ae16f264d6fc52b0c50bbf28c9e0
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.0.3 b/metadata/md5-cache/dev-haskell/tar-0.5.0.3
new file mode 100644
index 000000000000..f4597ee927e2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tar-0.5.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/bytestring-builder:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/bytestring-handle >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Reading, writing and manipulating ".tar" archive files
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/tar
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/bytestring-builder:=[profile?] dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.0.3
+SRC_URI=mirror://hackage/packages/archive/tar/0.5.0.3/tar-0.5.0.3.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b4a5e08574649ce8722d53d26c9871fe
diff --git a/metadata/md5-cache/dev-haskell/testing-feat-0.4.0.3 b/metadata/md5-cache/dev-haskell/testing-feat-0.4.0.3
new file mode 100644
index 000000000000..5e64b7edadb9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/testing-feat-0.4.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/tagshare-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Functional Enumeration of Algebraic Types
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/testing-feat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/tagshare-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.4.0.3
+SRC_URI=mirror://hackage/packages/archive/testing-feat/0.4.0.3/testing-feat-0.4.0.3.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d91586c6c3e4f71e85708a73d004d8fa
diff --git a/metadata/md5-cache/dev-haskell/thyme-0.3.5.5 b/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
new file mode 100644
index 000000000000..c9d9b81cf019
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/vector-space-0.8:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= lens? ( >=dev-haskell/lens-3.9:=[profile?] ) !lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/system-posix-redirect-1.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A faster time library
+EAPI=5
+HOMEPAGE=https://github.com/liyang/thyme
+IUSE=+bug-for-bug lens show-internal doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/vector-space-0.8:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= lens? ( >=dev-haskell/lens-3.9:=[profile?] ) !lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] )
+RESTRICT=test
+SLOT=0/0.3.5.5
+SRC_URI=mirror://hackage/packages/archive/thyme/0.3.5.5/thyme-0.3.5.5.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ea27b2115eb528170e158675181656a7
diff --git a/metadata/md5-cache/dev-haskell/vector-space-0.10.4 b/metadata/md5-cache/dev-haskell/vector-space-0.10.4
new file mode 100644
index 000000000000..53733a6b144d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-space-0.10.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Vector & affine spaces, linear maps, and derivatives
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/vector-space
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.4
+SRC_URI=mirror://hackage/packages/archive/vector-space/0.10.4/vector-space-0.10.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b660d08e783ccef79e2474b154e4103d
diff --git a/metadata/md5-cache/dev-haskell/wavy-0.1.0.0 b/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
new file mode 100644
index 000000000000..24a2638acecd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Process WAVE files in Haskell
+EAPI=6
+HOMEPAGE=http://bitbucket.org/robertmassaioli/wavy
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.0.0
+SRC_URI=mirror://hackage/packages/archive/wavy/0.1.0.0/wavy-0.1.0.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3db6ee09a61244c7d57cfd3ec34916b6
diff --git a/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.1 b/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.1
new file mode 100644
index 000000000000..3c10bbf08ac6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/hxt-9.3 <dev-haskell/hxt-9.4 >=dev-haskell/quickcheck-2.5 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Fast XML generation library
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/xmlgen
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-6.12.1:=
+RESTRICT=test
+SLOT=0/0.6.2.1
+SRC_URI=mirror://hackage/packages/archive/xmlgen/0.6.2.1/xmlgen-0.6.2.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=42fa8c0b9ad6f17b83e63c1252880015
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.1.1 b/metadata/md5-cache/dev-haskell/zlib-0.6.1.1
new file mode 100644
index 000000000000..e7ce74b40cb1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/zlib-0.6.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Compression and decompression in the gzip and zlib formats
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/zlib
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
+RESTRICT=test
+SLOT=0/0.6.1.1
+SRC_URI=mirror://hackage/packages/archive/zlib/0.6.1.1/zlib-0.6.1.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	d7daf420e069f26db73b306e83883cc2	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6f6cad44494231f0477854fb3a85ff16
diff --git a/metadata/md5-cache/dev-lang/crystal-0.19.1 b/metadata/md5-cache/dev-lang/crystal-0.19.1
new file mode 100644
index 000000000000..c0a40e48ffb4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/crystal-0.19.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=sys-devel/llvm-3.8.0 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0
+DESCRIPTION=The Crystal Programming Language
+EAPI=6
+HOMEPAGE=http://crystal-lang.org
+IUSE=doc examples +xml +yaml
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=sys-devel/llvm-3.8.0 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre sys-libs/libunwind dev-libs/pcl dev-libs/gmp:0 xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml )
+SLOT=0
+SRC_URI=https://github.com/crystal-lang/crystal/archive/0.19.1.tar.gz -> crystal-0.19.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.19.1/crystal-0.18.7-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.19.1/crystal-0.18.7-1-linux-i686.tar.gz )
+_md5_=e910a380a27528ff7086b7871105f242
diff --git a/metadata/md5-cache/dev-lang/php-5.6.25 b/metadata/md5-cache/dev-lang/php-5.6.25
index 65205cb3bedf..07ab8d466f62 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.25
+++ b/metadata/md5-cache/dev-lang/php-5.6.25
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=http://php.net/
 IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0 ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.6
 SRC_URI=http://php.net/distributions/php-5.6.25.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=be90b556bbf06b1eb44303170f0476fb
+_md5_=7361bd8564599e2edf8690e795ede971
diff --git a/metadata/md5-cache/dev-lang/python-3.4.5 b/metadata/md5-cache/dev-lang/python-3.4.5
index 856ad7737a41..16f6d51cfd59 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.5
+++ b/metadata/md5-cache/dev-lang/python-3.4.5
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.4/3.4m
 SRC_URI=http://www.python.org/ftp/python/3.4.5/Python-3.4.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.5-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=497fa229354ef300d51e148d5ef393eb
+_md5_=96ed44626d498c3b09a86258cbbbd544
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.6.3 b/metadata/md5-cache/dev-libs/appstream-glib-0.6.3
new file mode 100644
index 000000000000..232ccc7d2e09
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 >=dev-libs/json-glib-1.1.1 dev-libs/libyaml >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2 x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) stemmer? ( dev-libs/snowball-stemmer ) app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.19.7 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
+EAPI=6
+HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
+IUSE=+introspection nls stemmer
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 >=dev-libs/json-glib-1.1.1 dev-libs/libyaml >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2 x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) stemmer? ( dev-libs/snowball-stemmer ) !<dev-util/appdata-tools-0.1.8-r1
+SLOT=0/8
+SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.6.3.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=68b2493e43d440559b21fafdc53d6c41
diff --git a/metadata/md5-cache/dev-libs/expat-2.1.1-r1 b/metadata/md5-cache/dev-libs/expat-2.1.1-r1
deleted file mode 100644
index c91fd45a6645..000000000000
--- a/metadata/md5-cache/dev-libs/expat-2.1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stream-oriented XML parser library
-EAPI=5
-HOMEPAGE=http://expat.sourceforge.net/
-IUSE=elibc_FreeBSD examples static-libs unicode abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=mirror://sourceforge/expat/expat-2.1.1.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=01489e387b3749ae5b850b6149869523
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.24.4 b/metadata/md5-cache/dev-libs/libgit2-glib-0.24.4
new file mode 100644
index 000000000000..5fbcf147d7a6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.24.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/libgit2-0.24.0:0/24[ssh?] >=dev-libs/glib-2.44.0:2 >=dev-libs/gobject-introspection-0.10.1:= python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Git library for GLib
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
+IUSE=python ssh +vala python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/libgit2-0.24.0:0/24[ssh?] >=dev-libs/glib-2.44.0:2 >=dev-libs/gobject-introspection-0.10.1:= python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgit2-glib/0.24/libgit2-glib-0.24.4.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=62d2508753f79062faf1d5b58118adfb
diff --git a/metadata/md5-cache/dev-libs/libgudev-230-r1 b/metadata/md5-cache/dev-libs/libgudev-230-r1
new file mode 100644
index 000000000000..94b8ff81dec2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgudev-230-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.22.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-util/gtk-doc-am-1.18 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GObject bindings for libudev
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
+IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.22.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
+SLOT=0/0
+SRC_URI=mirror://gnome/sources/libgudev/230/libgudev-230.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=62b904151bf0a7f22e1d18a4a76d3108
diff --git a/metadata/md5-cache/dev-libs/link-grammar-4.8.6 b/metadata/md5-cache/dev-libs/link-grammar-4.8.6
deleted file mode 100644
index f5e395a8570d..000000000000
--- a/metadata/md5-cache/dev-libs/link-grammar-4.8.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A Syntactic English parser
-EAPI=5
-HOMEPAGE=http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/
-IUSE=aspell +hunspell java static-libs threads elibc_FreeBSD java
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.abisource.com/downloads/link-grammar/4.8.6/link-grammar-4.8.6.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=affaaf5e21d7f128d3daf9bf2ebee83c
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.3.3-r1 b/metadata/md5-cache/dev-libs/link-grammar-5.3.3-r1
deleted file mode 100644
index a422b22f67fc..000000000000
--- a/metadata/md5-cache/dev-libs/link-grammar-5.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) dev-lang/swig: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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A Syntactic English parser
-EAPI=5
-HOMEPAGE=http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/
-IUSE=aspell +hunspell java python static-libs threads elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/opencog/link-grammar/archive/link-grammar-5.3.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ce64aac208c92587146276de51245747
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.3.9 b/metadata/md5-cache/dev-libs/link-grammar-5.3.9
new file mode 100644
index 000000000000..3148ea125b27
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/link-grammar-5.3.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-lang/swig:0 sys-devel/autoconf-archive 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/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A Syntactic English parser
+EAPI=6
+HOMEPAGE=http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/
+IUSE=aspell +hunspell java python static-libs threads elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( 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(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.abisource.com/downloads/link-grammar/5.3.9/link-grammar-5.3.9.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a41dfdfaeafe74915d797499812f5aac
diff --git a/metadata/md5-cache/dev-libs/vrb-0.3.0 b/metadata/md5-cache/dev-libs/vrb-0.3.0
deleted file mode 100644
index 2f932bc9fdcc..000000000000
--- a/metadata/md5-cache/dev-libs/vrb-0.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=library for a virtual ring buffer
-EAPI=0
-HOMEPAGE=http://phil.ipal.org/freeware/vrb/
-KEYWORDS=x86 sparc
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://phil.ipal.org/freeware/vrb/vrb-0.3.0.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=64a142939bd484a0a1886a48cde6c24b
diff --git a/metadata/md5-cache/dev-libs/vrb-0.5.1 b/metadata/md5-cache/dev-libs/vrb-0.5.1-r1
similarity index 71%
rename from metadata/md5-cache/dev-libs/vrb-0.5.1
rename to metadata/md5-cache/dev-libs/vrb-0.5.1-r1
index bf55c3330f8c..64bac61b8119 100644
--- a/metadata/md5-cache/dev-libs/vrb-0.5.1
+++ b/metadata/md5-cache/dev-libs/vrb-0.5.1-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=configure install
 DESCRIPTION=Library for a virtual ring buffer
-EAPI=0
+EAPI=6
 HOMEPAGE=http://vrb.slashusr.org/
 IUSE=static
-KEYWORDS=~sparc ~x86
+KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=LGPL-2.1
+RDEPEND=sys-libs/glibc
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://vrb.slashusr.org/download/vrb-0.5.1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=a668bbdc78957e7966b98dec9c4f7609
+_md5_=ccc177d63bd6e936c753564746d87c7f
diff --git a/metadata/md5-cache/dev-lisp/flexi-streams-1.0.15 b/metadata/md5-cache/dev-lisp/flexi-streams-1.0.15
index 69fb6e673a27..013c62010adc 100644
--- a/metadata/md5-cache/dev-lisp/flexi-streams-1.0.15
+++ b/metadata/md5-cache/dev-lisp/flexi-streams-1.0.15
@@ -8,6 +8,6 @@ PDEPEND=virtual/commonlisp
 RDEPEND=!dev-lisp/cl-flexi-streams >=dev-lisp/trivial-gray-streams-20060925
 RESTRICT=mirror
 SLOT=0
-SRC_URI=https://github.com/edicl/flexi-streams/archive/v1.0.15.tar.gz
+SRC_URI=https://github.com/edicl/flexi-streams/archive/v1.0.15.tar.gz -> flexi-streams-1.0.15.tar.gz
 _eclasses_=common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=3af0175d52e63aafb6f84726cfd6e42f
+_md5_=f85d2fb38fa555da814eb7d443213b06
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.3.9 b/metadata/md5-cache/dev-lisp/sbcl-1.3.9
new file mode 100644
index 000000000000..29a31c3f0784
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.3.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/elfix )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode pax_kernel zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/1.3.9
+SRC_URI=mirror://sourceforge/sbcl/sbcl-1.3.9-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.3.9-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.9-armhf-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=bb8a60359d1dc5a8d446682013acaae6
diff --git a/metadata/md5-cache/dev-perl/Config-General-2.630.0 b/metadata/md5-cache/dev-perl/Config-General-2.630.0
new file mode 100644
index 000000000000..324f15cc4693
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-General-2.630.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-File-Spec virtual/perl-IO virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Config file parser module
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Config-General/
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
+_md5_=cd0d2ffdd69014d70d5255dbfe71bea3
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
index 5cd26209b9d4..c82bc4fbd6b0 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.45.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=0aa1c0b2f4727446efe7d1305553d7fa
+_md5_=dd0ce41ffba9ca6eb2aed2a6495e486d
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.500.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.500.0
index 6acdb4c1d5c4..9bc8313f9cd1 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.500.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.500.0
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.45.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=4aa5c25a55c748ac81071c28feae7686
+_md5_=e1ccfff1e2e2223f6dbb1ffc3106d689
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2 b/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2
index 3cc78d6f2701..0ce06591c824 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.410.0-r2
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=e932c64892949bd139ec60c078a4eac9
+_md5_=cec2ffafa513931e0c7a80fd72ee5ae2
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0 b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
index 9cf6695d5313..e5b21ee19d3e 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=80219e840dff7be0dd2d12a51dc7348b
+_md5_=977914cad003c3d06d6a7c61a5d73014
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.16 b/metadata/md5-cache/dev-python/Numdifftools-0.9.17
similarity index 97%
rename from metadata/md5-cache/dev-python/Numdifftools-0.9.16
rename to metadata/md5-cache/dev-python/Numdifftools-0.9.17
index 1f44e427fc0d..4973753f35fb 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.16
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.17
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=>=dev-python/algopy-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sci-libs/scipy-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=https://github.com/pbrod/numdifftools/archive/v0.9.16.tar.gz -> Numdifftools-0.9.16.tar.gz
+SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.17.zip
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7db00578b4c2c9868ee6b850ee169fee
+_md5_=0801cba7c7df3999450d3e5fa3277a41
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.0.7-r2 b/metadata/md5-cache/dev-python/PyECLib-1.0.7-r2
deleted file mode 100644
index cf2c468be865..000000000000
--- a/metadata/md5-cache/dev-python/PyECLib-1.0.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/jerasure 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=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/PyECLib
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/liberasurecode dev-libs/jerasure 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/P/PyECLib/PyECLib-1.0.7.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=708ad91b814bbfa21d268a9ba5653f64
diff --git a/metadata/md5-cache/dev-python/behave-1.2.5-r1 b/metadata/md5-cache/dev-python/behave-1.2.5-r1
new file mode 100644
index 000000000000..67aafbecd1f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/behave-1.2.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/parse-1.6.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(-)] >=dev-python/parse-type-0.3.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/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/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(-)] doc? ( >=dev-python/sphinx-1.2.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/sphinxcontrib-cheeseshop-0.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? ( >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/nose-1.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(-)] >=dev-python/pyhamcrest-1.8[python_targets_python2_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=behaviour-driven development, Python style
+EAPI=6
+HOMEPAGE=https://github.com/behave/behave
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/parse-1.6.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(-)] >=dev-python/parse-type-0.3.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/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/b/behave/behave-1.2.5.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=d78b8dbec99e1d4798bbb23caf8ca80c
diff --git a/metadata/md5-cache/dev-python/botocore-1.4.46 b/metadata/md5-cache/dev-python/botocore-1.4.51
similarity index 99%
rename from metadata/md5-cache/dev-python/botocore-1.4.46
rename to metadata/md5-cache/dev-python/botocore-1.4.51
index f074ad147067..dcc7f829cb8b 100644
--- a/metadata/md5-cache/dev-python/botocore-1.4.46
+++ b/metadata/md5-cache/dev-python/botocore-1.4.51
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docutils-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jmespath-0.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jmespath-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/python-dateutil-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.4.46.tar.gz
+SRC_URI=mirror://pypi/b/botocore/botocore-1.4.51.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a2d1740279b122c012394f9f2c9deadb
diff --git a/metadata/md5-cache/dev-python/configparser-3.5.0 b/metadata/md5-cache/dev-python/configparser-3.5.0
index 56ea426517f2..6b164eeb7a5c 100644
--- a/metadata/md5-cache/dev-python/configparser-3.5.0
+++ b/metadata/md5-cache/dev-python/configparser-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python-3 built-in configparser
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/configparser/
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=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/c/configparser/configparser-3.5.0.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a0d88acffff1a993b10a68c9299b4920
+_md5_=c9ead50660423423f5238bb0df6ed1f6
diff --git a/metadata/md5-cache/dev-python/cryptography-1.5 b/metadata/md5-cache/dev-python/cryptography-1.5
new file mode 100644
index 000000000000..87863816fdad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_3? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),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.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),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.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( ~dev-python/cryptography-vectors-1.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=5
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
+IUSE=libressl test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_3? ( >=dev-python/cffi-1.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),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.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),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.4.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) >=dev-python/idna-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyasn1-0.1.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-2.6.0 ) virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography/cryptography-1.5.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7f404bb0f44806d604002472b28726ad
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-1.5 b/metadata/md5-cache/dev-python/cryptography-vectors-1.5
new file mode 100644
index 000000000000..466daec2a60f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Test vectors for the cryptography package
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-1.5.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=57d198a52e906de18fa0c265a34c7105
diff --git a/metadata/md5-cache/dev-python/django-openstack-auth-1.2.0 b/metadata/md5-cache/dev-python/django-openstack-auth-1.2.0
deleted file mode 100644
index d235db477494..000000000000
--- a/metadata/md5-cache/dev-python/django-openstack-auth-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pbr-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Django authentication backend for use with OpenStack Keystone Identity backend
-EAPI=5
-HOMEPAGE=http://django_openstack_auth.readthedocs.org/
-IUSE=test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.4.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/django-1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django_openstack_auth/django_openstack_auth-1.2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=771306aa6b6d3c959b46b048d5b93db6
diff --git a/metadata/md5-cache/dev-python/django-openstack-auth-1.3.1 b/metadata/md5-cache/dev-python/django-openstack-auth-1.3.1
index 865245459beb..743690293dad 100644
--- a/metadata/md5-cache/dev-python/django-openstack-auth-1.3.1
+++ b/metadata/md5-cache/dev-python/django-openstack-auth-1.3.1
@@ -6,9 +6,9 @@ HOMEPAGE=http://django_openstack_auth.readthedocs.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/django-1.4.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/django-1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-config-1.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/python-keystoneclient-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+RDEPEND=>=dev-python/django-1.4.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/django-1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-config-1.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/python-keystoneclient-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django_openstack_auth/django_openstack_auth-1.3.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0bedd5e32a3bb1eeb8baaa12f166b219
+_md5_=48ef999436429936bd53caa852ee9fbe
diff --git a/metadata/md5-cache/dev-python/dugong-3.4 b/metadata/md5-cache/dev-python/dugong-3.4
deleted file mode 100644
index a092c2e3377c..000000000000
--- a/metadata/md5-cache/dev-python/dugong-3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/pytest[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python library for communicating with HTTP 1.1 servers
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/python-dugong/
-IUSE=doc examples test python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/d/dugong/dugong-3.4.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3192cd53ca71d1742987924b8726c08e
diff --git a/metadata/md5-cache/dev-python/dugong-3.5 b/metadata/md5-cache/dev-python/dugong-3.5
deleted file mode 100644
index 24e382158dc0..000000000000
--- a/metadata/md5-cache/dev-python/dugong-3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python library for communicating with HTTP 1.1 servers
-EAPI=5
-HOMEPAGE=https://bitbucket.org/nikratio/python-dugong/
-IUSE=doc examples test python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/d/dugong/dugong-3.5.tar.bz2
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d8c0c486ce3983ae6ede130e3d43a984
diff --git a/metadata/md5-cache/dev-python/dugong-3.7 b/metadata/md5-cache/dev-python/dugong-3.7
index cd0dd181d426..441fc457c7a9 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7
+++ b/metadata/md5-cache/dev-python/dugong-3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for communicating with HTTP 1.1 servers
 EAPI=6
 HOMEPAGE=https://bitbucket.org/nikratio/python-dugong/
 IUSE=doc examples test python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.tar.bz2
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0a98eb3200f6db1ff9b34335e96bff41
+_md5_=1985df6fd4c93a703ec1d4ec295fe27a
diff --git a/metadata/md5-cache/dev-python/flake8-3.0.4 b/metadata/md5-cache/dev-python/flake8-3.0.4-r1
similarity index 61%
rename from metadata/md5-cache/dev-python/flake8-3.0.4
rename to metadata/md5-cache/dev-python/flake8-3.0.4-r1
index e41aecea9a51..ddc0f40a835d 100644
--- a/metadata/md5-cache/dev-python/flake8-3.0.4
+++ b/metadata/md5-cache/dev-python/flake8-3.0.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pyflakes-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pyflakes-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/mccabe-0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=6
 HOMEPAGE=https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
@@ -7,9 +7,9 @@ IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pytho
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/mccabe-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pyflakes-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/pyflakes-0.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pyflakes-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pyflakes-1.2.0 !~dev-python/pyflakes-1.2.1 !~dev-python/pyflakes-1.2.2 >=dev-python/pycodestyle-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <=dev-python/pycodestyle-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.0.4.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d984ddadb6f79459dcc77b402ea43d40
+_md5_=ac09391f9ec0078cdd46acf99c8f13ac
diff --git a/metadata/md5-cache/dev-python/guessit-2.1.0 b/metadata/md5-cache/dev-python/guessit-2.1.0
new file mode 100644
index 000000000000..17216e7a1c6a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/guessit-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/babelfish-0.5.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/rebulk-0.7.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(-)] dev-python/python-dateutil[python_targets_python2_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(-)] 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(-)] test? ( >=dev-python/pytest-2.7.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(-)] dev-python/pytest-capturelog[python_targets_python2_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/pytest-runner[python_targets_python2_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(-)]
+DESCRIPTION=Python library for guessing information from video filenames
+EAPI=6
+HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/babelfish-0.5.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/rebulk-0.7.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(-)] dev-python/python-dateutil[python_targets_python2_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(-)] 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/g/guessit/guessit-2.1.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8f6e04ad4c8ea5ba3fa8492422aa4b00
diff --git a/metadata/md5-cache/dev-python/guessit-9999 b/metadata/md5-cache/dev-python/guessit-9999
index 7e7fd710b5c0..cea0621ea073 100644
--- a/metadata/md5-cache/dev-python/guessit-9999
+++ b/metadata/md5-cache/dev-python/guessit-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/babelfish-0.5.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/python-dateutil-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/python-dateutil-2.5.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/rebulk-0.7.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(-)] 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/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(-)] test? ( >=dev-python/pytest-2.7.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(-)] dev-python/pytest-capturelog[python_targets_python2_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/pytest-runner[python_targets_python2_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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-python/babelfish-0.5.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/rebulk-0.7.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/python-dateutil[python_targets_python2_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(-)] 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(-)] test? ( >=dev-python/pytest-2.7.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(-)] dev-python/pytest-capturelog[python_targets_python2_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/pytest-runner[python_targets_python2_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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Python library for guessing information from video filenames
 EAPI=6
 HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 LICENSE=LGPL-3
-RDEPEND=>=dev-python/babelfish-0.5.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/python-dateutil-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/python-dateutil-2.5.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/rebulk-0.7.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(-)] 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/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(-)]
+RDEPEND=>=dev-python/babelfish-0.5.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/rebulk-0.7.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/python-dateutil[python_targets_python2_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(-)] 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
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d8cc985753b49e7f0221e645be24f829
+_md5_=4690a6985e5ccf2ee382c2c24ee0a548
diff --git a/metadata/md5-cache/dev-python/hgtools-6.3 b/metadata/md5-cache/dev-python/hgtools-6.3
deleted file mode 100644
index 465d9e4ad800..000000000000
--- a/metadata/md5-cache/dev-python/hgtools-6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Classes and setuptools plugin for Mercurial repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/jaraco/hgtools/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgtools/hgtools-6.3.zip
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=45275160a51dfb6ef6f52d399196006c
diff --git a/metadata/md5-cache/dev-python/keyring-3.7 b/metadata/md5-cache/dev-python/keyring-3.7
deleted file mode 100644
index 74bd1a9d33b2..000000000000
--- a/metadata/md5-cache/dev-python/keyring-3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] app-arch/unzip test? ( dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=5
-HOMEPAGE=https://bitbucket.org/kang/python-keyring-lib
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-3.7.zip
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0d5d37deb5622a42377311cb4b52e9d2
diff --git a/metadata/md5-cache/dev-python/keyring-9.2.1 b/metadata/md5-cache/dev-python/keyring-9.2.1
deleted file mode 100644
index 933d55405379..000000000000
--- a/metadata/md5-cache/dev-python/keyring-9.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Provides access to the system keyring service
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-9.2.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8da628a4917c1c2be5bc2ec2c9eb1a63
diff --git a/metadata/md5-cache/dev-python/keystoneauth-2.4.0 b/metadata/md5-cache/dev-python/keystoneauth-2.4.0
deleted file mode 100644
index aebbd8ea7a2b..000000000000
--- a/metadata/md5-cache/dev-python/keystoneauth-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=This package contains tools for authenticating to an OpenStack-based cloud.
-EAPI=5
-HOMEPAGE=https://github.com/openstack/keystoneauth
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/positional-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-2.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3e0905f4ed59d46e8aca62be6e3224b0
diff --git a/metadata/md5-cache/dev-python/keystoneauth-2.4.1 b/metadata/md5-cache/dev-python/keystoneauth-2.4.1
index d33dca5513ae..8211c51d149f 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-2.4.1
+++ b/metadata/md5-cache/dev-python/keystoneauth-2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=This package contains tools for authenticating to an OpenStack-based
 EAPI=5
 HOMEPAGE=https://github.com/openstack/keystoneauth
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/positional-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-2.4.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9099989a72da9ad2fd99271245f7301b
+_md5_=3e0905f4ed59d46e8aca62be6e3224b0
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-2.3.1-r1 b/metadata/md5-cache/dev-python/keystonemiddleware-2.3.1-r1
deleted file mode 100644
index b3f21890b157..000000000000
--- a/metadata/md5-cache/dev-python/keystonemiddleware-2.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/bandit-0.13.2[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(-)]
-DESCRIPTION=A middleware for the OpenStack Keystone API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/keystonemiddleware
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[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/k/keystonemiddleware/keystonemiddleware-2.3.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=15baea1f6d48b06c58abf42be69bade8
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-2.3.2-r1 b/metadata/md5-cache/dev-python/keystonemiddleware-2.3.2-r1
deleted file mode 100644
index ef36de2a85b0..000000000000
--- a/metadata/md5-cache/dev-python/keystonemiddleware-2.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/bandit-0.13.2[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(-)]
-DESCRIPTION=A middleware for the OpenStack Keystone API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/keystonemiddleware
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[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/k/keystonemiddleware/keystonemiddleware-2.3.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1508795890c3eacb248d5b8b9ffbea95
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-2.3.3 b/metadata/md5-cache/dev-python/keystonemiddleware-2.3.3
deleted file mode 100644
index b4e24b435042..000000000000
--- a/metadata/md5-cache/dev-python/keystonemiddleware-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/bandit-0.13.2[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(-)]
-DESCRIPTION=A middleware for the OpenStack Keystone API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/keystonemiddleware
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/k/keystonemiddleware/keystonemiddleware-2.3.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d23ab7682800882db9bdaf304c74f38f
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-4.4.0 b/metadata/md5-cache/dev-python/keystonemiddleware-4.4.0
deleted file mode 100644
index d450e74ce151..000000000000
--- a/metadata/md5-cache/dev-python/keystonemiddleware-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-0.1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/bandit-0.17.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A middleware for the OpenStack Keystone API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/keystonemiddleware
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/positional-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-4.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10d6f9b26a89c641b9e1132e532dad45
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-4.4.1 b/metadata/md5-cache/dev-python/keystonemiddleware-4.4.1
index f33d4f739430..043c352605d0 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-4.4.1
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-4.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A middleware for the OpenStack Keystone API
 EAPI=5
 HOMEPAGE=https://github.com/openstack/keystonemiddleware
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/positional-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/python-keystoneclient-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-4.4.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0b9141223a4c531f0cfeab5e943938db
+_md5_=b7d4a74cbdf72aa45fd89b957c11290b
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.5.3 b/metadata/md5-cache/dev-python/matplotlib-1.5.3
new file mode 100644
index 000000000000..5351c834f7e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-1.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=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_3 python_targets_python3_4 python_targets_python3_5 test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[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_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=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_3 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	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=9f9715b30928b093aac3cc0fc8128e5b
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.16.0 b/metadata/md5-cache/dev-python/os-client-config-1.16.0
index 92a85ac16f4a..fc700053c428 100644
--- a/metadata/md5-cache/dev-python/os-client-config-1.16.0
+++ b/metadata/md5-cache/dev-python/os-client-config-1.16.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-0.1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-0.1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=OpenStack Client Configuation Library
 EAPI=6
 HOMEPAGE=http://www.openstack.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.16.0.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c54864ce0bca6fe5a686aad7b40aa648
+_md5_=ddd2f71d5c30536ce6c23eec952cd405
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.6.1 b/metadata/md5-cache/dev-python/os-client-config-1.6.1
deleted file mode 100644
index 20a12097eef8..000000000000
--- a/metadata/md5-cache/dev-python/os-client-config-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack Client Configuation Library
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.6.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=69d3ba278a86403c828f559319aebb9d
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.6.3 b/metadata/md5-cache/dev-python/os-client-config-1.6.3
deleted file mode 100644
index 1793c566099f..000000000000
--- a/metadata/md5-cache/dev-python/os-client-config-1.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=OpenStack Client Configuation Library
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.6.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1694e4b1536f415e727fde1fa0459098
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-1.8.2 b/metadata/md5-cache/dev-python/oslo-concurrency-1.8.2
deleted file mode 100644
index b3b891c37747..000000000000
--- a/metadata/md5-cache/dev-python/oslo-concurrency-1.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=library for running multi-thread, multi-process applications
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.concurrency
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/fixtures-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/posix_ipc[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-1.8.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f4a866abeef20a1b1891b7507c4d5eac
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-2.5.0 b/metadata/md5-cache/dev-python/oslo-concurrency-2.5.0
deleted file mode 100644
index 072b779c311e..000000000000
--- a/metadata/md5-cache/dev-python/oslo-concurrency-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=library for running multi-thread, multi-process applications
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.concurrency
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/posix_ipc[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fasteners-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-2.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=42bf367d2fd4c4c1cbb6990bb4fda4d4
diff --git a/metadata/md5-cache/dev-python/oslo-config-1.9.3 b/metadata/md5-cache/dev-python/oslo-config-1.9.3
deleted file mode 100644
index 015f21350c20..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo Configuration API
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-1.9.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=becb476ca1a0278888ed0d9e9e39c82f
diff --git a/metadata/md5-cache/dev-python/oslo-config-2.3.0 b/metadata/md5-cache/dev-python/oslo-config-2.3.0
deleted file mode 100644
index ab44ccfae9a2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo Configuration API
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-2.3.0.tar.gz -> oslo-config-2.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ef3757f7341b8d803b331a6bfcdfe413
diff --git a/metadata/md5-cache/dev-python/oslo-config-2.4.0 b/metadata/md5-cache/dev-python/oslo-config-2.4.0
deleted file mode 100644
index 6e138419758c..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Oslo Configuration API
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-2.4.0.tar.gz -> oslo-config-2.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b2f951d1e11639fbab927a8291da85c4
diff --git a/metadata/md5-cache/dev-python/oslo-context-0.1.0 b/metadata/md5-cache/dev-python/oslo-context-0.1.0
deleted file mode 100644
index 0fd765b9921c..000000000000
--- a/metadata/md5-cache/dev-python/oslo-context-0.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Helpers to maintain useful information about a request context
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.context
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.context/oslo.context-0.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6cd393dcdcaafc83f75582d2fd35dbc0
diff --git a/metadata/md5-cache/dev-python/oslo-context-0.1.0-r1 b/metadata/md5-cache/dev-python/oslo-context-0.1.0-r1
deleted file mode 100644
index ce62deb84549..000000000000
--- a/metadata/md5-cache/dev-python/oslo-context-0.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Helpers to maintain useful information about a request context
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.context
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.context/oslo.context-0.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10882b019205146e74747d63481967a7
diff --git a/metadata/md5-cache/dev-python/oslo-context-0.2.0 b/metadata/md5-cache/dev-python/oslo-context-0.2.0
deleted file mode 100644
index bb8280b5b099..000000000000
--- a/metadata/md5-cache/dev-python/oslo-context-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Helpers to maintain useful information about a request context
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.context
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.context/oslo.context-0.2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1d4981efa407608f8195ed2ec26d5333
diff --git a/metadata/md5-cache/dev-python/oslo-context-0.3.0 b/metadata/md5-cache/dev-python/oslo-context-0.3.0
deleted file mode 100644
index 8df9525d41e0..000000000000
--- a/metadata/md5-cache/dev-python/oslo-context-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Helpers to maintain useful information about a request context
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.context
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.context/oslo.context-0.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=346028904475121fe9e9a3ef0c97c7d5
diff --git a/metadata/md5-cache/dev-python/oslo-context-0.6.0 b/metadata/md5-cache/dev-python/oslo-context-0.6.0
deleted file mode 100644
index eb1f41b99514..000000000000
--- a/metadata/md5-cache/dev-python/oslo-context-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Helpers to maintain useful information about a request context
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.context
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.context/oslo.context-0.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=15a34e8d32587bb29a5ee8f9f65a4d63
diff --git a/metadata/md5-cache/dev-python/oslo-db-1.0.2 b/metadata/md5-cache/dev-python/oslo-db-1.0.2
deleted file mode 100644
index d97274b47c9f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.6.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( || ( ( >=dev-python/sqlalchemy-0.8.4[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.8.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) mysql? ( dev-python/mysql-python || ( ( >=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.8.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) postgres? ( dev-python/psycopg:2 || ( ( >=dev-python/sqlalchemy-0.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.8.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) >=dev-python/sqlalchemy-migrate-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-migrate-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.0.0[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-1.0.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f6fba70ccc23d4bd93090c216373dae2
diff --git a/metadata/md5-cache/dev-python/oslo-db-1.4.1 b/metadata/md5-cache/dev-python/oslo-db-1.4.1
deleted file mode 100644
index 972eaa965b8a..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( || ( ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) mysql? ( dev-python/mysql-python || ( ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) postgres? ( dev-python/psycopg:2 || ( ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) >=dev-python/sqlalchemy-migrate-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sqlalchemy-migrate-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-1.4.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3e186300f1c6e5e4825824a62176fe0b
diff --git a/metadata/md5-cache/dev-python/oslo-db-1.7.1 b/metadata/md5-cache/dev-python/oslo-db-1.7.1
deleted file mode 100644
index 533e8545dd55..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( || ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( dev-python/mysql-python || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) postgres? ( dev-python/psycopg:2 || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-1.7.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ddf45a09f7f5c015d84c70ceb3bc3c27
diff --git a/metadata/md5-cache/dev-python/oslo-db-1.7.2 b/metadata/md5-cache/dev-python/oslo-db-1.7.2
deleted file mode 100644
index 1ef9c81a1b3f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( || ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( dev-python/mysql-python || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) postgres? ( dev-python/psycopg:2 || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-1.7.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3654e3887be762d1450a52becb73549d
diff --git a/metadata/md5-cache/dev-python/oslo-db-1.8.0 b/metadata/md5-cache/dev-python/oslo-db-1.8.0
deleted file mode 100644
index e86cf57a71b7..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( || ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( dev-python/mysql-python || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) postgres? ( dev-python/psycopg:2 || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-1.8.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=42576e361ed6c09d7aba98d79e917943
diff --git a/metadata/md5-cache/dev-python/oslo-db-1.9.0 b/metadata/md5-cache/dev-python/oslo-db-1.9.0
deleted file mode 100644
index cd4c5b5a5385..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( || ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mysql? ( dev-python/mysql-python || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) postgres? ( dev-python/psycopg:2 || ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-1.9.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=42576e361ed6c09d7aba98d79e917943
diff --git a/metadata/md5-cache/dev-python/oslo-db-2.6.0 b/metadata/md5-cache/dev-python/oslo-db-2.6.0
deleted file mode 100644
index 9f242026b7c9..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0.0[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(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( || ( >=dev-python/sqlalchemy-0.9.9[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ) mysql? ( dev-python/mysql-python || ( >=dev-python/sqlalchemy-0.9.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ) postgres? ( dev-python/psycopg:2 || ( >=dev-python/sqlalchemy-0.9.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-2.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ec834e10a303f84f1b487f5746535e67
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.7.0 b/metadata/md5-cache/dev-python/oslo-db-4.7.0
deleted file mode 100644
index 9377ad7eb5f1..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-4.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=OpenStack Common DB Code
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( || ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) mysql? ( dev-python/mysql-python || ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) postgres? ( dev-python/psycopg:2 || ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.7.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7c7a001a3fb56543fd5da0cc0b1b2317
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.7.1 b/metadata/md5-cache/dev-python/oslo-db-4.7.1
index 813a8358def9..107f5562c2f9 100644
--- a/metadata/md5-cache/dev-python/oslo-db-4.7.1
+++ b/metadata/md5-cache/dev-python/oslo-db-4.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenStack Common DB Code
 EAPI=5
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.3.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( || ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) mysql? ( dev-python/mysql-python || ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) postgres? ( dev-python/psycopg:2 || ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.7.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0c4ff3f610c13e40e140368424eb6b1a
+_md5_=c6fec9f7ce2109585be1af9319d3612f
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-1.3.1 b/metadata/md5-cache/dev-python/oslo-i18n-1.3.1
deleted file mode 100644
index 66a6964b5294..000000000000
--- a/metadata/md5-cache/dev-python/oslo-i18n-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.i18n library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-1.3.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d6575a5b1b3c6f1eb98b4fedbe50fce4
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-1.5.0 b/metadata/md5-cache/dev-python/oslo-i18n-1.5.0
deleted file mode 100644
index a619eeaeedc9..000000000000
--- a/metadata/md5-cache/dev-python/oslo-i18n-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.i18n library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-1.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=548e8d3fea30f0d3b7a6591a340e0178
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-1.6.0 b/metadata/md5-cache/dev-python/oslo-i18n-1.6.0
deleted file mode 100644
index 3a5336f1e900..000000000000
--- a/metadata/md5-cache/dev-python/oslo-i18n-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.i18n library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-1.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8b8c07848e92a38fee38969fc39b1cae
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-2.6.0 b/metadata/md5-cache/dev-python/oslo-i18n-2.6.0
deleted file mode 100644
index e9691d39f50f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-i18n-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.i18n library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-2.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9594e4b5bd6a7d6a64bff5922c22ce39
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-2.7.0 b/metadata/md5-cache/dev-python/oslo-i18n-2.7.0
deleted file mode 100644
index 2cbe580188c9..000000000000
--- a/metadata/md5-cache/dev-python/oslo-i18n-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Oslo i18n library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-2.7.0.tar.gz -> oslo-i18n-2.7.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b012117b7f3cb55f0fcb86753c98667b
diff --git a/metadata/md5-cache/dev-python/oslo-log-0.3.0 b/metadata/md5-cache/dev-python/oslo-log-0.3.0
deleted file mode 100644
index f85824858943..000000000000
--- a/metadata/md5-cache/dev-python/oslo-log-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack logging config library provides standardized configuration for all openstack projects.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.log/oslo.log-0.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7dba7c6e19beeb659b38a8555c1fa717
diff --git a/metadata/md5-cache/dev-python/oslo-log-1.0.0 b/metadata/md5-cache/dev-python/oslo-log-1.0.0
deleted file mode 100644
index 4c390d674e45..000000000000
--- a/metadata/md5-cache/dev-python/oslo-log-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack logging config library provides standardized configuration for all openstack projects.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.log/oslo.log-1.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c5594158d60595729cc9e2e7dd73a5ce
diff --git a/metadata/md5-cache/dev-python/oslo-log-1.1.0 b/metadata/md5-cache/dev-python/oslo-log-1.1.0
deleted file mode 100644
index 3238f61379e2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-log-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack logging config library provides standardized configuration for all openstack projects.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.log/oslo.log-1.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=473103683f21a09343309cd1ccdf657a
diff --git a/metadata/md5-cache/dev-python/oslo-log-1.10.0 b/metadata/md5-cache/dev-python/oslo-log-1.10.0
deleted file mode 100644
index d26400f1109f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-log-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-0.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=OpenStack logging config library
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-0.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.log/oslo.log-1.10.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f65f940e95c983f1a46aa1e6e01a9e12
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.10.0 b/metadata/md5-cache/dev-python/oslo-messaging-1.10.0
deleted file mode 100644
index 0757971d6fbf..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyzmq-14.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0 >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/aioeventlet-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/trollius-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.10.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=92d370b086501460fae517aa1a1aeab4
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.4.1 b/metadata/md5-cache/dev-python/oslo-messaging-1.4.1
deleted file mode 100644
index 9272c72f469f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oslotest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.4.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.4.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d75d1b4738062282c0c2786d91e38d02
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.5.1 b/metadata/md5-cache/dev-python/oslo-messaging-1.5.1
deleted file mode 100644
index 160181fb8f77..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.15.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-0.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.5.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b4aa4cbd50977ca638a9b902e9fd6517
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.7.0 b/metadata/md5-cache/dev-python/oslo-messaging-1.7.0
deleted file mode 100644
index f72b9daae5a2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyzmq-14.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/aioeventlet-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/trollius-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.7.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8c6a5d69037ab11a8466e54a6d1e49a6
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.8.0 b/metadata/md5-cache/dev-python/oslo-messaging-1.8.0
deleted file mode 100644
index 07f67185beb7..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyzmq-14.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/aioeventlet-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/trollius-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.8.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=791c43af9add4c41076de215c50f99d6
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.8.2 b/metadata/md5-cache/dev-python/oslo-messaging-1.8.2
deleted file mode 100644
index fd10285d2a66..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyzmq-14.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/aioeventlet-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/trollius-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.8.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a6cd3264ab2867f2bb13b09bd1ae5ef1
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.8.3 b/metadata/md5-cache/dev-python/oslo-messaging-1.8.3
deleted file mode 100644
index e5c1afbb1991..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyzmq-14.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/aioeventlet-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/trollius-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.8.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ce3a26f14a0e7e789efb1d16aee6445b
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-1.9.0 b/metadata/md5-cache/dev-python/oslo-messaging-1.9.0
deleted file mode 100644
index fce3019eb1e8..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyzmq-14.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0 <dev-python/oslo-context-0.3.0 >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/aioeventlet-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/trollius-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-1.9.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=25e470db0d9ba0262ddeda1d099d6ca9
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-2.4.0 b/metadata/md5-cache/dev-python/oslo-messaging-2.4.0
deleted file mode 100644
index 093e4d6b3267..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/qpid-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyzmq-14.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Messaging API for RPC and notifications over a number of different messaging transports
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.messaging
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/futurist-0.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cachetools-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/py-amqp-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/kombu-3.0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/oslo-middleware-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/aioeventlet-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/trollius-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-2.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2204350cb5162894dfbf94a30f643177
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-0.4.0 b/metadata/md5-cache/dev-python/oslo-middleware-0.4.0
deleted file mode 100644
index a060b78a4581..000000000000
--- a/metadata/md5-cache/dev-python/oslo-middleware-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-0.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6f0329540027fd88b34d1041ca025366
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-0.5.0 b/metadata/md5-cache/dev-python/oslo-middleware-0.5.0
deleted file mode 100644
index 5893085a0bde..000000000000
--- a/metadata/md5-cache/dev-python/oslo-middleware-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-0.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=921fc48df596022018c114e2d7ae9e88
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-1.0.0 b/metadata/md5-cache/dev-python/oslo-middleware-1.0.0
deleted file mode 100644
index fa6dc07cdbf3..000000000000
--- a/metadata/md5-cache/dev-python/oslo-middleware-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-1.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=294b8dd456925a7e0b4ca6234c15a0c6
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-1.1.0 b/metadata/md5-cache/dev-python/oslo-middleware-1.1.0
deleted file mode 100644
index ae1aa3820a00..000000000000
--- a/metadata/md5-cache/dev-python/oslo-middleware-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-1.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=47c6b97857247c210260ba81e57b26aa
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-1.2.0 b/metadata/md5-cache/dev-python/oslo-middleware-1.2.0
deleted file mode 100644
index c6242228fa4c..000000000000
--- a/metadata/md5-cache/dev-python/oslo-middleware-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-1.2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=69970d5ffc0bc88bfb9e51280e4d7ac5
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-1.3.0 b/metadata/md5-cache/dev-python/oslo-middleware-1.3.0
deleted file mode 100644
index 02b7a35ad6db..000000000000
--- a/metadata/md5-cache/dev-python/oslo-middleware-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[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(-)]
-DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/oslo.middleware/oslo.middleware-1.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5bcc6b237d121486bfe119bd96a735c0
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-2.8.0 b/metadata/md5-cache/dev-python/oslo-middleware-2.8.0
deleted file mode 100644
index 1e65c310054e..000000000000
--- a/metadata/md5-cache/dev-python/oslo-middleware-2.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Library includes components to be injected into wsgi pipelines to intercept request/response flows.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.middleware
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-2.8.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5eaabf095d9e464ed45a43d3222c9469
diff --git a/metadata/md5-cache/dev-python/oslo-policy-0.11.0 b/metadata/md5-cache/dev-python/oslo-policy-0.11.0
deleted file mode 100644
index a7a62789516c..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-0.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[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(-)]
-DESCRIPTION=The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.policy
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/oslo.policy/oslo.policy-0.11.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9093eb578077e1394344855f60b15f2f
diff --git a/metadata/md5-cache/dev-python/oslo-policy-0.12.0 b/metadata/md5-cache/dev-python/oslo-policy-0.12.0
deleted file mode 100644
index b60cf0cc5e3b..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-0.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httpretty-0.8.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/httpretty-0.8.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.policy
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-0.12.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4e9338e3a25e1fceebee52f49fce1767
diff --git a/metadata/md5-cache/dev-python/oslo-policy-0.3.2 b/metadata/md5-cache/dev-python/oslo-policy-0.3.2
deleted file mode 100644
index 582f552765f2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services.
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.policy
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-0.3.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=151efe3951abb3668f43cddb7cc778f6
diff --git a/metadata/md5-cache/dev-python/oslo-reports-0.5.0 b/metadata/md5-cache/dev-python/oslo-reports-0.5.0
deleted file mode 100644
index 1b5c05fd3823..000000000000
--- a/metadata/md5-cache/dev-python/oslo-reports-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[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(-)]
-DESCRIPTION=generified reports for openstack
-EAPI=5
-HOMEPAGE=http://docs.openstack.org/developer/oslo.reports
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[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/o/oslo.reports/oslo.reports-0.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=16df819517f49431c29d46b3c291e133
diff --git a/metadata/md5-cache/dev-python/oslo-reports-0.6.0 b/metadata/md5-cache/dev-python/oslo-reports-0.6.0
deleted file mode 100644
index 93d6444be0b8..000000000000
--- a/metadata/md5-cache/dev-python/oslo-reports-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[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(-)]
-DESCRIPTION=generified reports for openstack
-EAPI=5
-HOMEPAGE=http://docs.openstack.org/developer/oslo.reports
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[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/o/oslo.reports/oslo.reports-0.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1fc016b960f10720da73525c1b180918
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-1.2.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-1.2.0
deleted file mode 100644
index 76344f0473db..000000000000
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.config
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-1.2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ba79727db46e741ad165458214c1c9fd
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-1.3.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-1.3.0
deleted file mode 100644
index 5887d978de61..000000000000
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.15.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.config
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-1.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3d1b11aa7500766110be024023012a53
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-1.6.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-1.6.0
deleted file mode 100644
index 5ba329ff8573..000000000000
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.config
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-1.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=29deb4f92a6d36ed403fe385f10095ee
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-2.3.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-2.3.0
deleted file mode 100644
index 9c9b09ccab53..000000000000
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[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(-)]
-DESCRIPTION=The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.config
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.9.0[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/o/oslo.rootwrap/oslo.rootwrap-2.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=957cb4e74a439ddecced28b76ff9feb9
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-2.4.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-2.4.0
deleted file mode 100644
index 3a438f968d3f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[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(-)]
-DESCRIPTION=The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.config
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.9.0[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/o/oslo.rootwrap/oslo.rootwrap-2.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dfaaf0b0bda71013953de4a990b7f394
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-1.3.0 b/metadata/md5-cache/dev-python/oslo-serialization-1.3.0
deleted file mode 100644
index f39502df9e87..000000000000
--- a/metadata/md5-cache/dev-python/oslo-serialization-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/hacking-0.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=oslo.serialization library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-1.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=79a4a88def31323403f925fa719904a2
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-1.3.0-r1 b/metadata/md5-cache/dev-python/oslo-serialization-1.3.0-r1
deleted file mode 100644
index 18389340df6e..000000000000
--- a/metadata/md5-cache/dev-python/oslo-serialization-1.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.serialization library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-1.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6f93110a06947c1224f759fb9613e4f1
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-1.4.0 b/metadata/md5-cache/dev-python/oslo-serialization-1.4.0
deleted file mode 100644
index 5b7631ebc672..000000000000
--- a/metadata/md5-cache/dev-python/oslo-serialization-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.serialization library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-1.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=45a42573592ec1c80b557b7addfbc328
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-1.5.0 b/metadata/md5-cache/dev-python/oslo-serialization-1.5.0
deleted file mode 100644
index 0ca9f5566346..000000000000
--- a/metadata/md5-cache/dev-python/oslo-serialization-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.serialization library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-1.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2e14eabf3168218770f812860c5f949f
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-1.9.0 b/metadata/md5-cache/dev-python/oslo-serialization-1.9.0
deleted file mode 100644
index fe6c514a5621..000000000000
--- a/metadata/md5-cache/dev-python/oslo-serialization-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=oslo.serialization library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-1.9.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c358a9c806f27581244235d108aabdef
diff --git a/metadata/md5-cache/dev-python/oslo-service-0.9.0 b/metadata/md5-cache/dev-python/oslo-service-0.9.0
deleted file mode 100644
index 51feac5d5d6a..000000000000
--- a/metadata/md5-cache/dev-python/oslo-service-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Library for running OpenStack services
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.service
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/monotonic-0.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.service/oslo.service-0.9.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=affec8afd6a1d86d55c6094a2da39baf
diff --git a/metadata/md5-cache/dev-python/oslo-sphinx-2.2.0-r1 b/metadata/md5-cache/dev-python/oslo-sphinx-2.2.0-r1
deleted file mode 100644
index a9c88f5b266d..000000000000
--- a/metadata/md5-cache/dev-python/oslo-sphinx-2.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack Sphinx Extensions
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslosphinx/oslosphinx-2.2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d3485ee0a906cf2d7e24e5ecf9752bbb
diff --git a/metadata/md5-cache/dev-python/oslo-sphinx-2.5.0 b/metadata/md5-cache/dev-python/oslo-sphinx-2.5.0
deleted file mode 100644
index 66099767b8f8..000000000000
--- a/metadata/md5-cache/dev-python/oslo-sphinx-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=OpenStack Sphinx Extensions
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslosphinx/oslosphinx-2.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e6e150f617807e31e13043b6da6f06fa
diff --git a/metadata/md5-cache/dev-python/oslo-utils-1.0.0 b/metadata/md5-cache/dev-python/oslo-utils-1.0.0
deleted file mode 100644
index b08ac480be22..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( >=dev-python/hacking-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslotest-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-i18n-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-1.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=38a5adaefc2ed86d71bdc781bc6edfee
diff --git a/metadata/md5-cache/dev-python/oslo-utils-1.1.0 b/metadata/md5-cache/dev-python/oslo-utils-1.1.0
deleted file mode 100644
index ca18957bf8b3..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/pbr-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-1.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=833aea2207eaa7d27952e0a034a7cd7b
diff --git a/metadata/md5-cache/dev-python/oslo-utils-1.2.1 b/metadata/md5-cache/dev-python/oslo-utils-1.2.1
deleted file mode 100644
index 5d2c8d40ce72..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/pbr-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-1.2.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0c265e797ac2b5924669b1c6ca91e5f1
diff --git a/metadata/md5-cache/dev-python/oslo-utils-1.3.0 b/metadata/md5-cache/dev-python/oslo-utils-1.3.0
deleted file mode 100644
index ce6c3993c0ec..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-1.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e08183d89b4ee0639ecca8e53e8c1ee0
diff --git a/metadata/md5-cache/dev-python/oslo-utils-1.4.0 b/metadata/md5-cache/dev-python/oslo-utils-1.4.0
deleted file mode 100644
index 9bf2fab93779..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-1.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6b34445c1c32a364ac16b3ffa2743ef2
diff --git a/metadata/md5-cache/dev-python/oslo-utils-1.5.0 b/metadata/md5-cache/dev-python/oslo-utils-1.5.0
deleted file mode 100644
index a8a9803c97ca..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-1.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5c05f3fb5b9d9800e911151f0d6bf419
diff --git a/metadata/md5-cache/dev-python/oslo-utils-2.4.0 b/metadata/md5-cache/dev-python/oslo-utils-2.4.0
deleted file mode 100644
index 5014d04499d2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Oslo Utility library
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-0.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-2.4.0.tar.gz -> oslo-utils-2.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8dffd7cff9ec7ffc9e8b3c7301c74b7c
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-0.10.0 b/metadata/md5-cache/dev-python/oslo-versionedobjects-0.10.0
deleted file mode 100644
index b5d99ab2137d..000000000000
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8.0[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(-)]
-DESCRIPTION=The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly.
-EAPI=5
-HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[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/o/oslo.versionedobjects/oslo.versionedobjects-0.10.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=09323897cc409771187af8aca33335a8
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-0.11.0 b/metadata/md5-cache/dev-python/oslo-versionedobjects-0.11.0
deleted file mode 100644
index 3b3b0f578b06..000000000000
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-0.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8.0[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(-)]
-DESCRIPTION=The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly.
-EAPI=5
-HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-messaging-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[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/o/oslo.versionedobjects/oslo.versionedobjects-0.11.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4802c721b0e1a3e4e4178edae9841da4
diff --git a/metadata/md5-cache/dev-python/oslo-vmware-0.11.2 b/metadata/md5-cache/dev-python/oslo-vmware-0.11.2
deleted file mode 100644
index 396b9da99a94..000000000000
--- a/metadata/md5-cache/dev-python/oslo-vmware-0.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pylint-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/mock-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[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(-)]
-DESCRIPTION=Oslo VMware library for OpenStack projects
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.vmware
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/urllib3-1.8.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/urllib3-1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-concurrency-1.9.0[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/o/oslo.vmware/oslo.vmware-0.11.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4923d5b3140da9efabce8f532c36611a
diff --git a/metadata/md5-cache/dev-python/oslo-vmware-1.21.0 b/metadata/md5-cache/dev-python/oslo-vmware-1.21.0
deleted file mode 100644
index bde0ad7059e6..000000000000
--- a/metadata/md5-cache/dev-python/oslo-vmware-1.21.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/bandit-0.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[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(-)]
-DESCRIPTION=Oslo VMware library for OpenStack projects
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/oslo.vmware
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.17.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/urllib3-1.8.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-2.3.0[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/o/oslo.vmware/oslo.vmware-1.21.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=27e6cb47a4aeb8f0093312b3ea2ca784
diff --git a/metadata/md5-cache/dev-python/oslotest-1.10.0 b/metadata/md5-cache/dev-python/oslotest-1.10.0
deleted file mode 100644
index 3ecd902669d3..000000000000
--- a/metadata/md5-cache/dev-python/oslotest-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo test framework
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-client-config-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslotest/oslotest-1.10.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d61c2f28569a8ea3d028aa92d132dc17
diff --git a/metadata/md5-cache/dev-python/oslotest-1.3.0 b/metadata/md5-cache/dev-python/oslotest-1.3.0
deleted file mode 100644
index 8198c8c4b7f7..000000000000
--- a/metadata/md5-cache/dev-python/oslotest-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/pbr-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack test framework
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslotest/oslotest-1.3.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4bd008ea285b0593678c5fd5a0ac9636
diff --git a/metadata/md5-cache/dev-python/oslotest-1.5.0 b/metadata/md5-cache/dev-python/oslotest-1.5.0
deleted file mode 100644
index e867b21fd243..000000000000
--- a/metadata/md5-cache/dev-python/oslotest-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/pbr-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack test framework
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslotest/oslotest-1.5.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0b809198af91105fceeb34abfedd0438
diff --git a/metadata/md5-cache/dev-python/oslotest-1.5.1 b/metadata/md5-cache/dev-python/oslotest-1.5.1
deleted file mode 100644
index eb3454bde2f4..000000000000
--- a/metadata/md5-cache/dev-python/oslotest-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=OpenStack test framework
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslotest/oslotest-1.5.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bb36300b4815fe6a7a077f41e8700ac0
diff --git a/metadata/md5-cache/dev-python/oslotest-1.6.0 b/metadata/md5-cache/dev-python/oslotest-1.6.0
deleted file mode 100644
index 83898d61dd5a..000000000000
--- a/metadata/md5-cache/dev-python/oslotest-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/pbr-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Oslo test framework
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~amd64-linux ~x86 ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslotest/oslotest-1.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=208a7b8b6eec0419ddedfabee64adbf5
diff --git a/metadata/md5-cache/dev-python/oslotest-2.4.0 b/metadata/md5-cache/dev-python/oslotest-2.4.0
index c445d1e260d2..f4c76ffeffb2 100644
--- a/metadata/md5-cache/dev-python/oslotest-2.4.0
+++ b/metadata/md5-cache/dev-python/oslotest-2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Oslo test framework
 EAPI=5
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-client-config-1.13.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-2.4.0.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=695f7e5a890afd0a740851428cc53b5c
+_md5_=06f97cbcbca6a8e96cf12f760166a71b
diff --git a/metadata/md5-cache/dev-python/parse-1.6.6 b/metadata/md5-cache/dev-python/parse-1.6.6
new file mode 100644
index 000000000000..919a4c78a317
--- /dev/null
+++ b/metadata/md5-cache/dev-python/parse-1.6.6
@@ -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 ) 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=parse() is the opposite of format()
+EAPI=6
+HOMEPAGE=https://github.com/r1chardj0n3s/parse
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+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 ) 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/parse/parse-1.6.6.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=6f26573ff10a94f9d37c8aa8f4b18a63
diff --git a/metadata/md5-cache/dev-python/parse-type-0.3.4-r1 b/metadata/md5-cache/dev-python/parse-type-0.3.4-r1
new file mode 100644
index 000000000000..71c49a97bbe9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/parse-type-0.3.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/parse-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/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-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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/pytest-runner[python_targets_python2_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=Simplifies to build parse types based on the parse module
+EAPI=6
+HOMEPAGE=https://github.com/jenisys/parse_type
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/parse-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/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-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/parse_type/parse_type-0.3.4.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=2acd79d1657d4823f16b05f1774a69fc
diff --git a/metadata/md5-cache/dev-python/pycadf-0.6.0 b/metadata/md5-cache/dev-python/pycadf-0.6.0
deleted file mode 100644
index 3074e81ecd2a..000000000000
--- a/metadata/md5-cache/dev-python/pycadf-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/docutils-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=python implementation of DMTF Cloud Audit (CADF) data model
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pycadf
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/posix_ipc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2010h[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycadf/pycadf-0.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=68e1d7f54d54ae64997fdc4f402cbedc
diff --git a/metadata/md5-cache/dev-python/pycadf-0.8.0 b/metadata/md5-cache/dev-python/pycadf-0.8.0
deleted file mode 100644
index 3020373c926c..000000000000
--- a/metadata/md5-cache/dev-python/pycadf-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinxcontrib-httpdomain[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=python implementation of DMTF Cloud Audit (CADF) data model
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pycadf
-IUSE=doc test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013d[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycadf/pycadf-0.8.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c8ff10cce683be515513171eded31140
diff --git a/metadata/md5-cache/dev-python/pycadf-1.0.0 b/metadata/md5-cache/dev-python/pycadf-1.0.0
deleted file mode 100644
index 16150638a8f1..000000000000
--- a/metadata/md5-cache/dev-python/pycadf-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pbr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinxcontrib-httpdomain[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=python implementation of DMTF Cloud Audit (CADF) data model
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pycadf
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-1.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycadf/pycadf-1.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c627837d90577618b9415726bba779dd
diff --git a/metadata/md5-cache/dev-python/pycadf-1.1.0 b/metadata/md5-cache/dev-python/pycadf-1.1.0
deleted file mode 100644
index 7fae6070b9c0..000000000000
--- a/metadata/md5-cache/dev-python/pycadf-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=python implementation of DMTF Cloud Audit (CADF) data model
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/pycadf
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-config-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycadf/pycadf-1.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fb6c8fc44aff444c7f9eaf0672f39a99
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-1.9.0 b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0
new file mode 100644
index 000000000000..7be7d4b54273
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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(-)] 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(-)] doc? ( >=dev-python/sphinx-1.2.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/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( >=dev-python/pytest-2.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/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=Hamcrest framework for matcher objects
+EAPI=6
+HOMEPAGE=https://github.com/hamcrest/PyHamcrest
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=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(-)] 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/P/PyHamcrest/PyHamcrest-1.9.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=6c65efb509e4db924833d0294ffa6324
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-3.0.1 b/metadata/md5-cache/dev-python/python-barbicanclient-3.0.1
deleted file mode 100644
index 395b9b0173f0..000000000000
--- a/metadata/md5-cache/dev-python/python-barbicanclient-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Client library for Barbican API.
-EAPI=5
-HOMEPAGE=https://github.com/openstack/barbican
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.11.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cliff-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-barbicanclient/python-barbicanclient-3.0.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fb7728804d2585622155f1f2e07abb09
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-3.0.3 b/metadata/md5-cache/dev-python/python-barbicanclient-3.0.3
deleted file mode 100644
index 5bedea4516ec..000000000000
--- a/metadata/md5-cache/dev-python/python-barbicanclient-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[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(-)]
-DESCRIPTION=Client library for Barbican API.
-EAPI=5
-HOMEPAGE=https://github.com/openstack/barbican
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cliff-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cliff-1.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[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/python-barbicanclient/python-barbicanclient-3.0.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a04c002161b13ab4e8466248c9e4acf6
diff --git a/metadata/md5-cache/dev-python/python-ceilometerclient-1.0.10 b/metadata/md5-cache/dev-python/python-ceilometerclient-1.0.10
deleted file mode 100644
index 2ec666515ca1..000000000000
--- a/metadata/md5-cache/dev-python/python-ceilometerclient-1.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=This is a client library for Ceilometer built on the Ceilometer API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-ceilometerclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.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 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-ceilometerclient/python-ceilometerclient-1.0.10.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9be3e279586a7d10e6c59fa41e0d8a39
diff --git a/metadata/md5-cache/dev-python/python-ceilometerclient-1.1.1 b/metadata/md5-cache/dev-python/python-ceilometerclient-1.1.1
index 29dbc8f1a0f7..1c44caaba36a 100644
--- a/metadata/md5-cache/dev-python/python-ceilometerclient-1.1.1
+++ b/metadata/md5-cache/dev-python/python-ceilometerclient-1.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/fixtures-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/mock-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/fixtures-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/mock-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=This is a client library for Ceilometer built on the Ceilometer API
 EAPI=5
 HOMEPAGE=https://github.com/openstack/python-ceilometerclient
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/python-keystoneclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ceilometerclient/python-ceilometerclient-1.1.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=36217aec427de29e58db15176dc6c36e
+_md5_=79da5a54302d50235318b1f8a3e0eb29
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-1.0.9 b/metadata/md5-cache/dev-python/python-cinderclient-1.0.9
deleted file mode 100644
index 406ebc0c95b8..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-1.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Cinder API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-cinderclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.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 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-1.0.9.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a00bfe7baa7a198176747793ad0edbd9
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-1.1.2 b/metadata/md5-cache/dev-python/python-cinderclient-1.1.2
deleted file mode 100644
index 5f3dfc27f87f..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/mock-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Cinder API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-cinderclient
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-keystoneclient-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-1.1.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c3acf863f71cc50125112d2d86d91bf8
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-1.2.1 b/metadata/md5-cache/dev-python/python-cinderclient-1.2.1
deleted file mode 100644
index 873b654d0f4a..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempest-lib-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Cinder API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-cinderclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-1.2.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=af3a5f5bf55236d25fe253f030db73dd
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-1.2.1-r1 b/metadata/md5-cache/dev-python/python-cinderclient-1.2.1-r1
deleted file mode 100644
index aabb9c9eeed9..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-1.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempest-lib-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Cinder API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-cinderclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-1.2.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=15cf0f02a18abbc53f99c64a89a76a55
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-1.3.1 b/metadata/md5-cache/dev-python/python-cinderclient-1.3.1
deleted file mode 100644
index d5cd9688ac5b..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Cinder API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-cinderclient
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-1.3.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b213baaeec8784154bdf9e0eb6bce7ad
diff --git a/metadata/md5-cache/dev-python/python-evdev-0.6.1 b/metadata/md5-cache/dev-python/python-evdev-0.6.1
new file mode 100644
index 000000000000..e648e793640f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-evdev-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python library for evdev bindings
+EAPI=5
+HOMEPAGE=https://python-evdev.readthedocs.org/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/gvalkov/python-evdev/archive/v0.6.1.tar.gz -> python-evdev-0.6.1.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=41d37cb36f28ab96b16fc265fcf3162b
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-1.1.1 b/metadata/md5-cache/dev-python/python-glanceclient-1.1.1
deleted file mode 100644
index b5d08ce475f7..000000000000
--- a/metadata/md5-cache/dev-python/python-glanceclient-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Glance API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-glanceclient
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/warlock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/warlock-2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-1.1.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=41f0ea0dd038198c10975394d5f76a00
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.0.0 b/metadata/md5-cache/dev-python/python-glanceclient-2.0.0
deleted file mode 100644
index 8d7b44f51b58..000000000000
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ordereddict[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-client-config-1.13.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-0.1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tempest-lib-0.14.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Glance API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-glanceclient
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/warlock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/warlock-2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3f2b4a5453cd01d1976fd16f8173ec42
diff --git a/metadata/md5-cache/dev-python/python-heatclient-0.6.0 b/metadata/md5-cache/dev-python/python-heatclient-0.6.0
deleted file mode 100644
index 42e6b8b13ad4..000000000000
--- a/metadata/md5-cache/dev-python/python-heatclient-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack Orchestration API Client Library
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-0.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1ca76c159702b605572f3cc68c1b3bef
diff --git a/metadata/md5-cache/dev-python/python-heatclient-0.7.0 b/metadata/md5-cache/dev-python/python-heatclient-0.7.0
deleted file mode 100644
index c871cb0fdd12..000000000000
--- a/metadata/md5-cache/dev-python/python-heatclient-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=OpenStack Orchestration API Client Library
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-0.7.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e14eb630e4ce77e037f3cd106e8ffac3
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-0.5.1 b/metadata/md5-cache/dev-python/python-ironicclient-0.5.1
deleted file mode 100644
index 97ae2c1418b8..000000000000
--- a/metadata/md5-cache/dev-python/python-ironicclient-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/httpretty-0.8.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/httpretty-0.8.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/httpretty-0.8.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python bindings for the Ironic API
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-0.5.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=546cef92206ec38e8b86c7209885b52b
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-0.8.1 b/metadata/md5-cache/dev-python/python-ironicclient-0.8.1
deleted file mode 100644
index f675f6a6c2b8..000000000000
--- a/metadata/md5-cache/dev-python/python-ironicclient-0.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httpretty-0.8.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/httpretty-0.8.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[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(-)]
-DESCRIPTION=Python bindings for the Ironic API
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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/python-ironicclient/python-ironicclient-0.8.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2882581c98aeddbfd8d0d9c23e99bdf4
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-1.3.1 b/metadata/md5-cache/dev-python/python-keystoneclient-1.3.1
deleted file mode 100644
index 60bb51d558ef..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Client Library for OpenStack Identity
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-1.3.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fb7931baa210f27db43cebcd18a67ce8
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-1.3.2 b/metadata/md5-cache/dev-python/python-keystoneclient-1.3.2
deleted file mode 100644
index b17da323424a..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-1.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/tempest-lib-0.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/tempest-lib-0.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Client Library for OpenStack Identity
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~amd64-linux ~x86 ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-1.3.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10fffb0826dd547803c24ec7e5c65df4
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-1.7.3 b/metadata/md5-cache/dev-python/python-keystoneclient-1.7.3
deleted file mode 100644
index c6ba4d35e99d..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-1.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/bandit-0.13.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oauthlib-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/bandit-0.13.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Client Library for OpenStack Identity
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-0.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-1.7.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=231bcfbbd2b0abb6066e8a34dda54bf5
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-1.7.4 b/metadata/md5-cache/dev-python/python-keystoneclient-1.7.4
deleted file mode 100644
index 4413ba9a7108..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-1.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/bandit-0.13.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oauthlib-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/bandit-0.13.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Client Library for OpenStack Identity
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-0.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-1.7.4.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=231bcfbbd2b0abb6066e8a34dda54bf5
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-2.3.6 b/metadata/md5-cache/dev-python/python-neutronclient-2.3.6
deleted file mode 100644
index 1002d36440b6..000000000000
--- a/metadata/md5-cache/dev-python/python-neutronclient-2.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cliff-tablib-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oslotest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Quantum API
-EAPI=5
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cliff-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[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=test? ( doc ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-2.3.6.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8ba59de2108080a1506f6d46e861ac62
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-2.4.0 b/metadata/md5-cache/dev-python/python-neutronclient-2.4.0
deleted file mode 100644
index c0ad7962e4c7..000000000000
--- a/metadata/md5-cache/dev-python/python-neutronclient-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslotest-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Quantum API
-EAPI=5
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cliff-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/cliff-1.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-2.4.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=02705a603e6791a44f4005b5baebf097
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-2.6.0 b/metadata/md5-cache/dev-python/python-neutronclient-2.6.0
deleted file mode 100644
index 9a010a12e4d3..000000000000
--- a/metadata/md5-cache/dev-python/python-neutronclient-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-tablib-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Quantum API
-EAPI=5
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cliff-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-2.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=20aa9746e66260d6d45f6e8165ccf593
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-3.0.0 b/metadata/md5-cache/dev-python/python-neutronclient-3.0.0
deleted file mode 100644
index 3915f3c1d623..000000000000
--- a/metadata/md5-cache/dev-python/python-neutronclient-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/cliff-tablib-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Quantum API
-EAPI=5
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-1.14.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-3.0.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7dc975b257ce678c1f789e92727fa758
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-3.1.1 b/metadata/md5-cache/dev-python/python-neutronclient-3.1.1
deleted file mode 100644
index 50ad9e5056f2..000000000000
--- a/metadata/md5-cache/dev-python/python-neutronclient-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/cliff-tablib-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Quantum API
-EAPI=5
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-1.14.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-3.1.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a0209487ac8c63a6b9735f1a26dfeb89
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.17.0 b/metadata/md5-cache/dev-python/python-novaclient-2.17.0
deleted file mode 100644
index 388ab8492f21..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=!dev-python/rax-default-network-flags-python-novaclient-ext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/os-networksv2-python-novaclient-ext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/os-diskconfig-python-novaclient-ext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-2.17.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fcdc43f63c2bd4e8666115cd4ca123a5
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.17.0-r1 b/metadata/md5-cache/dev-python/python-novaclient-2.17.0-r1
deleted file mode 100644
index c06542567f65..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.17.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-2.17.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=496e36af3143a1d588b840911707dbf1
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.20.0 b/metadata/md5-cache/dev-python/python-novaclient-2.20.0
deleted file mode 100644
index 56fd79de64ba..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-2.20.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f113d24fb53d6b4fa2a5abc8a5aa8aa6
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.23.2 b/metadata/md5-cache/dev-python/python-novaclient-2.23.2
deleted file mode 100644
index ceaedc34a5d0..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.23.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/fixtures-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/mock-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-sphinx-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/tempest-lib-0.5.0[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(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/python-keystoneclient-1.4.0[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/python-novaclient/python-novaclient-2.23.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=958e94dbb84dbafd42665c24547cdc50
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.25.0 b/metadata/md5-cache/dev-python/python-novaclient-2.25.0
deleted file mode 100644
index a557f3c1880f..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempest-lib-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-2.25.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=829fa9abce5717e8226a86db1044719f
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.27.0 b/metadata/md5-cache/dev-python/python-novaclient-2.27.0
deleted file mode 100644
index b9ec8776ee92..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.27.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-2.27.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2f45345cf348c19cb50fc76937de4b5a
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.30.1 b/metadata/md5-cache/dev-python/python-novaclient-2.30.1
deleted file mode 100644
index 5f186e5de735..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.30.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-client-config-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/os-client-config-1.6.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-2.30.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7b756cdc2646028a2d09aadf06639cb1
diff --git a/metadata/md5-cache/dev-python/python-novaclient-2.30.2 b/metadata/md5-cache/dev-python/python-novaclient-2.30.2
deleted file mode 100644
index fd12250bb2f8..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-2.30.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-client-config-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/os-client-config-1.6.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-2.30.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4b14a2c110f857fe90b3665e5a88eb98
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-1.6.0 b/metadata/md5-cache/dev-python/python-openstackclient-1.6.0
deleted file mode 100644
index 7cfc0abe4654..000000000000
--- a/metadata/md5-cache/dev-python/python-openstackclient-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-testr-0.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack APIs
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-openstackclient
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-1.14.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-tablib-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-client-config-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.11.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.26.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-1.6.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e6e696bc89b16b75a0b69b6ecf55eee2
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-1.7.1 b/metadata/md5-cache/dev-python/python-openstackclient-1.7.1
deleted file mode 100644
index 8a3eb85e94bd..000000000000
--- a/metadata/md5-cache/dev-python/python-openstackclient-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-testr-0.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack APIs
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-openstackclient
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-1.14.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-tablib-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-client-config-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/os-client-config-1.6.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.28.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-1.7.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4db696326bf86e4f13c18d23d8792975
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-1.7.2 b/metadata/md5-cache/dev-python/python-openstackclient-1.7.2
deleted file mode 100644
index dd0b8f4e2a15..000000000000
--- a/metadata/md5-cache/dev-python/python-openstackclient-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-testr-0.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A client for the OpenStack APIs
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-openstackclient
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-1.14.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/cliff-tablib-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/os-client-config-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/os-client-config-1.6.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-2.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/oslo-utils-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.28.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-1.7.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c870c4950be74369b0b4aec89807379d
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-0.11.0 b/metadata/md5-cache/dev-python/python-saharaclient-0.11.0
index b73cc1a52b48..003deaa893d8 100644
--- a/metadata/md5-cache/dev-python/python-saharaclient-0.11.0
+++ b/metadata/md5-cache/dev-python/python-saharaclient-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-neutronclient-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.26.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempest-lib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[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(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.26.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempest-lib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=This is a client for the OpenStack Sahara API, aka HADOOP
 EAPI=5
 HOMEPAGE=https://github.com/openstack/python-saharaclient
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-0.11.0.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=54a450fb0053ca96e93a3be4a737ec72
+_md5_=1af101897a11649f32addfad3a7c5008
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-0.7.0 b/metadata/md5-cache/dev-python/python-saharaclient-0.7.0
deleted file mode 100644
index 2df45d375285..000000000000
--- a/metadata/md5-cache/dev-python/python-saharaclient-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/docutils-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oslo-sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.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(-)]
-DESCRIPTION=This is a client for the OpenStack Sahara API, aka HADOOP
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-saharaclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-0.7.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1dc0973eed511a9170ef8f615a3a5202
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-0.9.0 b/metadata/md5-cache/dev-python/python-saharaclient-0.9.0
deleted file mode 100644
index 13ee0225c2bf..000000000000
--- a/metadata/md5-cache/dev-python/python-saharaclient-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.3.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-neutronclient-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempest-lib-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=This is a client for the OpenStack Sahara API, aka HADOOP
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-saharaclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-0.9.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3396aef9aff4f2eaff02dbb1553d8e28
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-2.0.3 b/metadata/md5-cache/dev-python/python-swiftclient-2.0.3
deleted file mode 100644
index cb562c78e24e..000000000000
--- a/metadata/md5-cache/dev-python/python-swiftclient-2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pbr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.4.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.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(-)]
-DESCRIPTION=Python bindings to the OpenStack Object Storage API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-swiftclient
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-2.0.3.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=462cde47fe86e0be9efbb8137f036ef1
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-2.1.0 b/metadata/md5-cache/dev-python/python-swiftclient-2.1.0
deleted file mode 100644
index 8c331fde30e1..000000000000
--- a/metadata/md5-cache/dev-python/python-swiftclient-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pbr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.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(-)]
-DESCRIPTION=Python bindings to the OpenStack Object Storage API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-swiftclient
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.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 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-2.1.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f21a8761becdacc3622b7799e5f58eff
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-2.2.0-r1 b/metadata/md5-cache/dev-python/python-swiftclient-2.2.0-r1
deleted file mode 100644
index aa67e47bd6e1..000000000000
--- a/metadata/md5-cache/dev-python/python-swiftclient-2.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python bindings to the OpenStack Object Storage API
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-swiftclient
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-2.2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e9b82fc3cccf68ea4e35c55ae212de14
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.0.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.0.0
index 387c6ae7387e..e32697be031a 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.0.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings to the OpenStack Object Storage API
 EAPI=5
 HOMEPAGE=https://launchpad.net/python-swiftclient
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.0.0.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e598954c20ae0765ad47ca96cb407a35
+_md5_=52e0d3c11107361eeea601836cb0cfed
diff --git a/metadata/md5-cache/dev-python/python-troveclient-1.0.5 b/metadata/md5-cache/dev-python/python-troveclient-1.0.5
deleted file mode 100644
index 293b6f350540..000000000000
--- a/metadata/md5-cache/dev-python/python-troveclient-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.5.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/hacking-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=This is a client for the OpenStack Trove API, a scalable relational database service
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-troveclient
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-1.0.5.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f485955aebe3de8c8bfb860ef4f2a624
diff --git a/metadata/md5-cache/dev-python/rebulk-0.7.3 b/metadata/md5-cache/dev-python/rebulk-0.7.4
similarity index 98%
rename from metadata/md5-cache/dev-python/rebulk-0.7.3
rename to metadata/md5-cache/dev-python/rebulk-0.7.4
index 21f8716af9bc..bda22e271be2 100644
--- a/metadata/md5-cache/dev-python/rebulk-0.7.3
+++ b/metadata/md5-cache/dev-python/rebulk-0.7.4
@@ -9,6 +9,6 @@ LICENSE=MIT 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/r/rebulk/rebulk-0.7.3.tar.gz
+SRC_URI=mirror://pypi/r/rebulk/rebulk-0.7.4.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=167d3ecb018f555db5b0dbeb4583e37f
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.0.1 b/metadata/md5-cache/dev-python/s3transfer-0.0.1
deleted file mode 100644
index 3ff52d334be8..000000000000
--- a/metadata/md5-cache/dev-python/s3transfer-0.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/botocore[python_targets_python2_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(-)] 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=Amazon S3 Transfer Manager
-EAPI=6
-HOMEPAGE=http://pypi.python.org/pypi/s3transfer
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/botocore[python_targets_python2_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/s/s3transfer/s3transfer-0.0.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ae6316fe854e28075859760d58afab3b
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.1.3 b/metadata/md5-cache/dev-python/s3transfer-0.1.3
new file mode 100644
index 000000000000..6d92ae767341
--- /dev/null
+++ b/metadata/md5-cache/dev-python/s3transfer-0.1.3
@@ -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/botocore-1.3.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/botocore-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/futures-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/futures-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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[python_targets_python2_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=An Amazon S3 Transfer Manager
+EAPI=6
+HOMEPAGE=https://github.com/boto/s3transfer
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.3.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/botocore-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-python/futures-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/futures-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.1.3.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=bfb535958ac3332960ead18ec2320799
diff --git a/metadata/md5-cache/dev-python/sh-1.07 b/metadata/md5-cache/dev-python/sh-1.07
deleted file mode 100644
index b149c851f7cb..000000000000
--- a/metadata/md5-cache/dev-python/sh-1.07
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Python subprocess interface
-EAPI=5
-HOMEPAGE=https://github.com/amoffat/sh
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=https://github.com/amoffat/sh/archive/1.07.tar.gz -> sh-1.07.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=efe49d5c20075cb5762eeb3eab3d77b5
diff --git a/metadata/md5-cache/dev-python/sh-1.08 b/metadata/md5-cache/dev-python/sh-1.08
deleted file mode 100644
index 729d8cc0ea4a..000000000000
--- a/metadata/md5-cache/dev-python/sh-1.08
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Python subprocess interface
-EAPI=5
-HOMEPAGE=https://github.com/amoffat/sh
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=https://github.com/amoffat/sh/archive/1.08.tar.gz -> sh-1.08.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=661d9cc0fa39dbca393512b8aea972b2
diff --git a/metadata/md5-cache/dev-python/sh-1.09 b/metadata/md5-cache/dev-python/sh-1.09
deleted file mode 100644
index afdddccc1f61..000000000000
--- a/metadata/md5-cache/dev-python/sh-1.09
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python subprocess interface
-EAPI=5
-HOMEPAGE=https://github.com/amoffat/sh
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/s/sh/sh-1.09.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8e4eb175aabe8fa59cfb451ceceb1faf
diff --git a/metadata/md5-cache/dev-python/sh-1.11-r1 b/metadata/md5-cache/dev-python/sh-1.11-r1
new file mode 100644
index 000000000000..7bb504b425d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sh-1.11-r1
@@ -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 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python subprocess interface
+EAPI=5
+HOMEPAGE=https://github.com/amoffat/sh
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/s/sh/sh-1.11.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=b3fe834f55e1027d6c3a05d78f5138f6
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-cheeseshop-0.2-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-cheeseshop-0.2-r1
new file mode 100644
index 000000000000..209ec4fe499d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-cheeseshop-0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)]
+DESCRIPTION=Sphinx extension cheeseshop
+EAPI=6
+HOMEPAGE=https://bitbucket.org/birkenfeld/sphinx-contrib
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/sphinx-1.0[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(-)] 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/s/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e462acef38ca0fe3935a624384d5a4fe
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
new file mode 100644
index 000000000000..37f6a2350f91
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby22] =dev-ruby/railties-5*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby23] =dev-ruby/railties-5*:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=XML parameters parser for Action Pack (removed from core in Rails 4.0)
+EAPI=5
+HOMEPAGE=https://github.com/rails/actionpack-xml_parser
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby22] =dev-ruby/railties-5*:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/actionpack-5*:*[ruby_targets_ruby23] =dev-ruby/railties-5*:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=2
+SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.0.tar.gz -> actionpack-xml_parser-2.0.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3ee7536e0b2cf885081b139ce09e1126
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.8.1 b/metadata/md5-cache/dev-ruby/acts_as_list-0.8.1
new file mode 100644
index 000000000000..e9b9e1667bed
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/activerecord[ruby_targets_ruby20,sqlite] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] dev-ruby/activerecord[ruby_targets_ruby21,sqlite] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] dev-ruby/activerecord[ruby_targets_ruby22,sqlite] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/activerecord[ruby_targets_ruby23,sqlite] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
+EAPI=5
+HOMEPAGE=https://github.com/swanandp/acts_as_list
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~x86-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=3
+SRC_URI=mirror://rubygems/acts_as_list-0.8.1.gem
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c2497b595f7f24289ac4c7fa07339d36
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
index 1bca068889b2..a4072c5b6bdc 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A Ruby wrapper for the MRI 2.0 debug_inspector API
 EAPI=5
 HOMEPAGE=https://github.com/banister/debug_inspector
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/debug_inspector-0.0.2.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ed41e18854696950ebbd776925da7a24
+_md5_=455e822f22274d37e4cde53968c6ea1e
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
index 35b7e9ec0d9b..d863018accbf 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
 EAPI=5
 HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-ui-rails-4.2.1.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0230d2840539b0aebb7c2fe5b20608dd
+_md5_=ccdbf633c2d1a698cf153de85a594325
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.2 b/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
similarity index 64%
rename from metadata/md5-cache/dev-ruby/rbtree-0.4.2
rename to metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
index 2208ef1e1a97..6c23179fd929 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.2
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.2-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Ruby/RBTree module
 EAPI=5
 HOMEPAGE=http://www.geocities.co.jp/SiliconValley-PaloAlto/3388/rbtree/README.html
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbtree-0.4.2.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3764231c8f8d3b55a2e6af3505f33452
+_md5_=3a0e28c2979ef07ff91b1bd27e5a4208
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1 b/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
deleted file mode 100644
index 68b34e262052..000000000000
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Forking implementation of rackup
-EAPI=5
-HOMEPAGE=https://rtomayko.github.com/shotgun/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/shotgun-0.9.gem
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c3a30110d7973a45449218196d77bac
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.2 b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
new file mode 100644
index 000000000000..6f2af947713a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bacon[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bacon[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Forking implementation of rackup
+EAPI=5
+HOMEPAGE=https://github.com/rtomayko/shotgun
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/shotgun-0.9.2.gem
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e965f2a9c04e70c408b9dfca19aaa190
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.3.1 b/metadata/md5-cache/dev-ruby/web-console-3.3.1
new file mode 100644
index 000000000000..17a034443b1a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/web-console-3.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] dev-ruby/debug_inspector[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] dev-ruby/debug_inspector[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/rails-5.0[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] www-servers/puma[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/rails-5.0[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] www-servers/puma[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A debugging tool for your Ruby on Rails applications
+EAPI=5
+HOMEPAGE=https://github.com/rails/web-console
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby22] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby22] dev-ruby/debug_inspector[ruby_targets_ruby22] >=dev-ruby/railties-5.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/actionview-5.0:*[ruby_targets_ruby23] >=dev-ruby/activemodel-5.0:*[ruby_targets_ruby23] dev-ruby/debug_inspector[ruby_targets_ruby23] >=dev-ruby/railties-5.0:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=3
+SRC_URI=https://github.com/rails/web-console/archive/v3.3.1.tar.gz -> web-console-3.3.1.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=680a0c11cbadfe3efd849de976292fb4
diff --git a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11 b/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
index ff8929fb45d3..c37066b6c128 100644
--- a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
+++ b/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
@@ -4,10 +4,10 @@ DESCRIPTION=LaTeX to RTF converter
 EAPI=6
 HOMEPAGE=http://latex2rtf.sourceforge.net/
 IUSE=test
-KEYWORDS=alpha ~amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base media-gfx/imagemagick
 SLOT=0
 SRC_URI=mirror://sourceforge/latex2rtf/latex2rtf-2.3.11a.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=de1ec5ffd187fcf15c7b97f0e9d9d5d8
+_md5_=6001a8728426c624eec61a612dc5b7d9
diff --git a/metadata/md5-cache/dev-util/cmake-3.6.2 b/metadata/md5-cache/dev-util/cmake-3.6.2
index 81163a55fa88..0aed9dea884d 100644
--- a/metadata/md5-cache/dev-util/cmake-3.6.2
+++ b/metadata/md5-cache/dev-util/cmake-3.6.2
@@ -10,4 +10,4 @@ RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.2
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v3.6/cmake-3.6.2.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=f0ada47743bce29d1362b23b346ecdbb
+_md5_=534a4921121b3aa2e1c17fa70857c6df
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.80 b/metadata/md5-cache/dev-util/debootstrap-1.0.82
similarity index 93%
rename from metadata/md5-cache/dev-util/debootstrap-1.0.80
rename to metadata/md5-cache/dev-util/debootstrap-1.0.82
index db1dd1181e53..25687832ec2c 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.80
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.82
@@ -6,6 +6,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64
 LICENSE=MIT
 RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
 SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.80.tar.gz mirror://gentoo/devices.tar.gz
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.82.tar.gz mirror://gentoo/devices.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=a793f79862838818d17f7bf8e4465a8b
diff --git a/metadata/md5-cache/dev-util/gcovr-3.3 b/metadata/md5-cache/dev-util/gcovr-3.3
new file mode 100644
index 000000000000..0f7fe6541ad7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gcovr-3.3
@@ -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 ) 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=A Python script for summarizing gcov data
+EAPI=6
+HOMEPAGE=https://github.com/gcovr/gcovr
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+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 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/gcovr/gcovr/archive/3.3.tar.gz -> gcovr-3.3.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=288dd41c99b3423634c5fcf60d3be990
diff --git a/metadata/md5-cache/dev-util/qbs-1.6.0 b/metadata/md5-cache/dev-util/qbs-1.6.0
new file mode 100644
index 000000000000..f59342d90ec3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/qbs-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qdoc:5 dev-qt/qthelp:5 ) test? ( dev-qt/qtdeclarative:5 )
+DESCRIPTION=Cross-platform build tool
+EAPI=6
+HOMEPAGE=https://wiki.qt.io/Qbs
+IUSE=doc examples test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 test? ( dev-qt/qttest:5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.qt.io/official_releases/qbs/1.6.0/qbs-src-1.6.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=d5eb5cdf00f97403364b685962535c47
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.20.2 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.20.2
new file mode 100644
index 000000000000..6407ad68160c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.20.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3 || ( dev-lang/vala:0.32 dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) >=dev-util/intltool-0.50.1 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Clocks application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-clocks/3.20/gnome-clocks-3.20.2.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=f08c6e0b9d31f930d2fbefac8fc64dbd
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.20.1
new file mode 100644
index 000000000000..f5905dbecf97
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.20.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-misc/tracker-1:=[miner-fs] >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.19.1:3[introspection] x11-libs/pango[introspection] dev-libs/libxslt >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A document manager application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Documents
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-misc/tracker-1:=[miner-fs] >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.19.1:3[introspection] x11-libs/pango[introspection] media-libs/clutter[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-documents/3.20/gnome-documents-3.20.1.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=cbfe7b10c025cb0234f7b7513f7a5bc4
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.2 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.2
new file mode 100644
index 000000000000..acb05595e77c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:= !<gnome-base/gnome-control-center-3.9 app-text/yelp-tools app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Personal file sharing for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-user-share
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.2.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=65f6be9ad77e69bb7669ee6659eea287
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.4.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.4.0
new file mode 100644
index 000000000000..56d4b6f38ae6
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= modemmanager? ( net-misc/modemmanager ) teamd? ( >=dev-libs/jansson-2.3 ) >=dev-util/intltool-0.50.1 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection modemmanager teamd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= modemmanager? ( net-misc/modemmanager ) teamd? ( >=dev-libs/jansson-2.3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.4/network-manager-applet-1.4.0.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=6ac4646d7f5af873c290fa72609f03d4
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.3.5 b/metadata/md5-cache/mail-filter/rspamd-1.3.5
new file mode 100644
index 000000000000..5c81fe99165e
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rspamd-1.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/ragel dev-libs/openssl:0[-bindist] fann? ( sci-mathematics/fann ) jit? ( dev-libs/libpcre[jit] dev-lang/luajit:2 ) !jit? ( dev-libs/libpcre[-jit] >=dev-lang/lua-5.1:0 ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime dev-util/ragel sys-apps/file virtual/libiconv sys-devel/make >=dev-util/cmake-2.8.12 virtual/pkgconfig
+DESCRIPTION=Rapid spam filtering system
+EAPI=5
+HOMEPAGE=https://github.com/vstakhov/rspamd
+IUSE=fann +jit
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/openssl:0[-bindist] fann? ( sci-mathematics/fann ) jit? ( dev-libs/libpcre[jit] dev-lang/luajit:2 ) !jit? ( dev-libs/libpcre[-jit] >=dev-lang/lua-5.1:0 ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime dev-util/ragel sys-apps/file virtual/libiconv
+SLOT=0
+SRC_URI=https://rspamd.com/downloads/rspamd-1.3.5.tar.xz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=40be40342feecd321d357e9c60db4f4b
diff --git a/metadata/md5-cache/mate-base/mate-1.10.0-r2 b/metadata/md5-cache/mate-base/mate-1.10.0-r2
deleted file mode 100644
index 112df35f3f4b..000000000000
--- a/metadata/md5-cache/mate-base/mate-1.10.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
-EAPI=5
-HOMEPAGE=http://mate-desktop.org
-IUSE=+base -bluetooth +notification +themes +extras
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-PDEPEND=notification? ( x11-misc/mate-notification-daemon ) virtual/notification-daemon:0
-RDEPEND==mate-base/mate-desktop-1.10*:0 =mate-base/mate-menus-1.10*:0 =mate-base/mate-panel-1.10*:0 =mate-base/mate-session-manager-1.10*:0 =mate-base/mate-settings-daemon-1.10*:0 =x11-wm/marco-1.10*:0 base? ( =mate-base/caja-1.10*:0 =mate-base/mate-applets-meta-1.10*:0 =mate-base/mate-control-center-1.10*:0 =mate-extra/mate-media-1.10*:0 =x11-misc/mozo-1.10*:0 =x11-terms/mate-terminal-1.10*:0 ) bluetooth? ( net-wireless/blueman:0 ) themes? ( =x11-themes/mate-backgrounds-1.10*:0 =x11-themes/mate-icon-theme-1.10*:0 =x11-themes/mate-themes-meta-1.10*:0 ) extras? ( =app-arch/engrampa-1.10*:0 =app-editors/pluma-1.10*:0 =app-text/atril-1.10*:0 gnome-extra/gnome-calculator:0 =mate-extra/caja-extensions-1.10*:0 =mate-extra/mate-netbook-1.10*:0 =mate-extra/mate-power-manager-1.10*:0 =mate-extra/mate-screensaver-1.10*:0 =mate-extra/mate-system-monitor-1.10*:0 =mate-extra/mate-utils-1.10*:0 =media-gfx/eom-1.10*:0 =net-analyzer/mate-netspeed-1.10*:0 sys-apps/gnome-disk-utility:0 )
-SLOT=0
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fe613f030f6f28be209b1a07f0877d98
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.10.4-r2 b/metadata/md5-cache/mate-base/mate-applets-1.10.4-r2
new file mode 100644
index 000000000000..7c6d907bcfab
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-applets-1.10.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.10:0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=gnome-extra/gucharmap-2.32.1:0 >=mate-base/mate-desktop-1.10:0 >=mate-base/mate-panel-1.10:0 >=mate-base/mate-settings-daemon-1.10:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-2.30:1 x11-libs/pango:0 >=x11-themes/mate-icon-theme-1.10:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.92:0 ) app-text/docbook-xml-dtd:4.3 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.35:* dev-libs/libxslt:0 >=mate-base/mate-common-1.10:0 sys-devel/gettext:* sys-kernel/linux-headers virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Applets for the MATE Desktop and Panel
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=X ipv6 policykit +upower python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 FDL-1.1 LGPL-2
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.10:0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=gnome-extra/gucharmap-2.32.1:0 >=mate-base/mate-desktop-1.10:0 >=mate-base/mate-panel-1.10:0 >=mate-base/mate-settings-daemon-1.10:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-2.30:1 x11-libs/pango:0 >=x11-themes/mate-icon-theme-1.10:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.92:0 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.10/mate-applets-1.10.4.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=d0166402ce8f5f6ad9f30e71c3bf1ae6
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.12.1-r1 b/metadata/md5-cache/mate-base/mate-applets-1.12.1-r2
similarity index 91%
rename from metadata/md5-cache/mate-base/mate-applets-1.12.1-r1
rename to metadata/md5-cache/mate-base/mate-applets-1.12.1-r2
index 418cbc378f11..e5fbbd1950ba 100644
--- a/metadata/md5-cache/mate-base/mate-applets-1.12.1-r1
+++ b/metadata/md5-cache/mate-base/mate-applets-1.12.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=mate-base/mate-settings-daemon-1.6 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) app-text/docbook-xml-dtd:4.3 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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 >=mate-base/mate-common-1.12
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.6.1[gtk3(-)=] >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2= >=mate-base/mate-desktop-1.9[gtk3(-)=] >=mate-base/mate-panel-1.7[gtk3(-)=] >=mate-base/mate-settings-daemon-1.6 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=gnome-extra/gucharmap-2.32.1:0 >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 >=x11-libs/libwnck-2.30:1 ) gtk3? ( >=gnome-extra/gucharmap-3.0:2.90 >=x11-libs/gtk+-3.0:3 x11-libs/gtksourceview:3.0 >=x11-libs/libwnck-3.0:3 ) policykit? ( >=sys-auth/polkit-0.92:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) app-text/docbook-xml-dtd:4.3 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 sys-devel/gettext:* sys-kernel/linux-headers virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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 >=mate-base/mate-common-1.12
 DESCRIPTION=Applets for the MATE Desktop and Panel
 EAPI=6
 HOMEPAGE=http://mate-desktop.org
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.12/mate-applets-1.12.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mate	deba441b42c68cba7b817dd8b441788e	mate-desktop.org	69a0f50dcb300b04a513d60bc326029c	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=60ea894b61bb6fa78cf11ab9d4b84fc4
+_md5_=9d54b604bb723e5fb8376acc6d48a60a
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.10.4-r1 b/metadata/md5-cache/mate-extra/mate-utils-1.10.4-r1
new file mode 100644
index 000000000000..8f7ebd1b31de
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.10.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4:0[gtk] sys-libs/zlib:0 >=x11-libs/gtk+-2.24:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.10:0 ) >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50:* >=mate-base/mate-common-1.10:0 x11-proto/xextproto:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Utilities for the MATE desktop
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=X applet ipv6 test debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4:0[gtk] sys-libs/zlib:0 >=x11-libs/gtk+-2.24:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.10:0 )
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.10/mate-utils-1.10.4.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a1a0352d66de6ae8266beda915daa3c7
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.12.0-r1 b/metadata/md5-cache/mate-extra/mate-utils-1.12.0-r2
similarity index 98%
rename from metadata/md5-cache/mate-extra/mate-utils-1.12.0-r1
rename to metadata/md5-cache/mate-extra/mate-utils-1.12.0-r2
index 409322d83fff..6d20767ca963 100644
--- a/metadata/md5-cache/mate-extra/mate-utils-1.12.0-r1
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.12.0-r2
@@ -10,4 +10,4 @@ RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/lib
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.12/mate-utils-1.12.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mate	deba441b42c68cba7b817dd8b441788e	mate-desktop.org	69a0f50dcb300b04a513d60bc326029c	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f280b35da5fbb706749e98cc8d6e627e
+_md5_=06874c34c9e5521f56ac8c770652d254
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.38 b/metadata/md5-cache/media-gfx/asymptote-2.38
new file mode 100644
index 000000000000..f55a61a2de71
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/asymptote-2.38
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) X? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] x11-misc/xdg-utils dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base ) !<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/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=A vector graphics language that provides a framework for technical drawing
+EAPI=5
+HOMEPAGE=http://asymptote.sourceforge.net/
+IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( >=media-libs/mesa-8 ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) X? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] x11-misc/xdg-utils dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
+REQUIRED_USE=python_targets_python2_7 offscreen? ( opengl )
+SLOT=0
+SRC_URI=mirror://sourceforge/asymptote/asymptote-2.38.src.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	latex-package	58e25573cc86e53dddea91261009b301	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=272fe832d7ff02d90b5461c26a9f8815
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.1.6.0 b/metadata/md5-cache/media-gfx/displaycal-3.1.6.0
new file mode 100644
index 000000000000..3becd681d68a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/displaycal-3.1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:2.8 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 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=Display calibration and characterization powered by Argyll CMS
+EAPI=5
+HOMEPAGE=https://displaycal.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:2.8 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 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://sourceforge/dispcalgui/DisplayCAL-3.1.6.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=af7c59183d4cb2c1a75357364a9bc468
diff --git a/metadata/md5-cache/media-gfx/eom-1.12.2-r2 b/metadata/md5-cache/media-gfx/eom-1.12.2-r3
similarity index 99%
rename from metadata/md5-cache/media-gfx/eom-1.12.2-r2
rename to metadata/md5-cache/media-gfx/eom-1.12.2-r3
index e8babe70b8b3..9633f33af427 100644
--- a/metadata/md5-cache/media-gfx/eom-1.12.2-r2
+++ b/metadata/md5-cache/media-gfx/eom-1.12.2-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.12/eom-1.12.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	mate	deba441b42c68cba7b817dd8b441788e	mate-desktop.org	69a0f50dcb300b04a513d60bc326029c	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cb62aa423715f13d6f2c61a88bdbf9b9
+_md5_=c3499eace21608be3de51b1403fc1ebe
diff --git a/metadata/md5-cache/media-libs/gd-2.2.3 b/metadata/md5-cache/media-libs/gd-2.2.3
index f9694ad41afc..af051832b19e 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.3
+++ b/metadata/md5-cache/media-libs/gd-2.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=A graphics library for fast image creation
 EAPI=6
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.3/libgd-2.2.3.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=8076b5d1843a2eba1507217cef6e0d90
+_md5_=fbb64be4fd36d751c680c0df99f0e5a9
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.1 b/metadata/md5-cache/media-sound/rhythmbox-3.4.1
new file mode 100644
index 000000000000..bf4ea0c9a644
--- /dev/null
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.16:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( >=dev-python/pygobject-3.0:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) udev? ( virtual/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) visualizer? ( >=media-libs/clutter-1.8:1.0 >=media-libs/clutter-gst-1.9.92:2.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 >=media-plugins/gst-plugins-libvisual-1.4:1.0 ) zeitgeist? ( gnome-extra/zeitgeist ) app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Music management and playback software for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
+IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av visualizer zeitgeist python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.16:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( >=dev-python/pygobject-3.0:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) udev? ( virtual/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) visualizer? ( >=media-libs/clutter-1.8:1.0 >=media-libs/clutter-gst-1.9.92:2.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 >=media-plugins/gst-plugins-libvisual-1.4:1.0 ) zeitgeist? ( gnome-extra/zeitgeist ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] net-libs/libsoup:2.4[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3:0.3 >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.1.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5dd5faf9073907a0b1bab2f4edcec068
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.0.6 b/metadata/md5-cache/net-analyzer/wireshark-2.0.6
index 0603edb06ad5..63b95ec9529a 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.0.6
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
 IUSE=adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark cpu_flags_x86_sse4_2 ssl zlib +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
 SLOT=0/2.0.6
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.0.6.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=d4fd34e88f41e609e86adaccaff33c16
+_md5_=c75c5a81ed3c7d8d2d24d0c6bfe53a8d
diff --git a/metadata/md5-cache/net-im/ejabberd-16.08 b/metadata/md5-cache/net-im/ejabberd-16.08
new file mode 100644
index 000000000000..b081535a3595
--- /dev/null
+++ b/metadata/md5-cache/net-im/ejabberd-16.08
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-erlang/cache_tab-1.0.3 >=dev-erlang/esip-1.0.7 >=dev-erlang/fast_tls-1.0.6 >=dev-erlang/fast_xml-1.1.14 >=dev-erlang/fast_yaml-1.0.5 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.5 >=dev-erlang/stun-1.0.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.1 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) >=sys-apps/gawk-4.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1 || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
+DESCRIPTION=Robust, scalable and extensible XMPP server
+EAPI=6
+HOMEPAGE=http://www.ejabberd.im/ https://github.com/processone/ejabberd/
+IUSE=captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis riak roster-gw sqlite zlib
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-erlang/cache_tab-1.0.3 >=dev-erlang/esip-1.0.7 >=dev-erlang/fast_tls-1.0.6 >=dev-erlang/fast_xml-1.1.14 >=dev-erlang/fast_yaml-1.0.5 >=dev-erlang/jiffy-0.14.7 >=dev-erlang/lager-3.2.1 >=dev-erlang/luerl-0.2 >=dev-erlang/p1_oauth2-0.6.1 >=dev-erlang/p1_utils-1.0.5 >=dev-erlang/p1_xmlrpc-1.15.1 >=dev-erlang/stringprep-1.0.5 >=dev-erlang/stun-1.0.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.1 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/p1_pam-1.0.0 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( >=dev-erlang/hamcrest-0.1.0_p20150103 >=dev-erlang/riakc-2.1.1_p20151111 ) sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) zlib? ( >=dev-erlang/ezlib-1.0.1 ) captcha? ( media-gfx/imagemagick[truetype,png] ) dev-lang/erlang
+REQUIRED_USE=mssql? ( odbc )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.process-one.net/downloads/ejabberd/16.08/ejabberd-16.08.tgz -> ejabberd-16.08.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	rebar	98c3519ff55e51c3d222cde7f9f5d2e9	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=ab89a4a31a4cea4ce2f5132b921b50f4
diff --git a/metadata/md5-cache/net-im/skype-1.7.0.1 b/metadata/md5-cache/net-im/skype-1.7.0.1
new file mode 100644
index 000000000000..80e53143e29b
--- /dev/null
+++ b/metadata/md5-cache/net-im/skype-1.7.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=P2P Internet Telephony (VoiceIP) client
+EAPI=5
+HOMEPAGE=http://www.skype.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=Skype-TOS no-source-code
+RDEPEND=!net-im/skype:0 virtual/ttf-fonts gnome-base/libgnome-keyring gnome-base/gnome-keyring gnome-base/gconf
+RESTRICT=mirror bindist strip
+SLOT=1
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_1.7.0.1-1.x86_64.rpm
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=ea7e878c5057934b5b52cf6a55ed8647
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.4 b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.4
new file mode 100644
index 000000000000..0bd3e248e9b9
--- /dev/null
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An account manager and channel dispatcher for the Telepathy framework
+EAPI=6
+HOMEPAGE=https://cgit.freedesktop.org/telepathy/telepathy-mission-control/
+IUSE=debug networkmanager
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.4.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=bb1be955babdb74e6bd46c26be555648
diff --git a/metadata/md5-cache/net-irc/unrealircd-3.2.10.7 b/metadata/md5-cache/net-irc/unrealircd-3.2.10.7
new file mode 100644
index 000000000000..ed9e30e63cb5
--- /dev/null
+++ b/metadata/md5-cache/net-irc/unrealircd-3.2.10.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[adns] ) dev-libs/tre >=net-dns/c-ares-1.7 >=sys-apps/sed-4 virtual/pkgconfig ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
+DESCRIPTION=An advanced Internet Relay Chat daemon
+EAPI=4
+HOMEPAGE=http://www.unrealircd.com/
+IUSE=class-nofakelag curl ipv6 +extban-stacking +operoverride operoverride-verify +prefixaq showlistmodes shunnotices ssl topicisnuhost +usermod zlib ssl
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[adns] ) dev-libs/tre >=net-dns/c-ares-1.7
+SLOT=0
+SRC_URI=http://www.unrealircd.com/downloads/Unreal3.2.10.7.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	ssl-cert	b031e94f4c7c34e1d677376b8929821a	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=327a9ea769fd2ed55752d42d1fb51989
diff --git a/metadata/md5-cache/net-irc/unrealircd-4.0.5 b/metadata/md5-cache/net-irc/unrealircd-4.0.6
similarity index 53%
rename from metadata/md5-cache/net-irc/unrealircd-4.0.5
rename to metadata/md5-cache/net-irc/unrealircd-4.0.6
index 2a13d4a5ed61..ef5990ae49b7 100644
--- a/metadata/md5-cache/net-irc/unrealircd-4.0.5
+++ b/metadata/md5-cache/net-irc/unrealircd-4.0.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst preinst prepare pretend setup
-DEPEND=ssl? ( dev-libs/openssl:= ) curl? ( net-misc/curl[adns] ) dev-libs/libpcre2 dev-libs/tre >=net-dns/c-ares-1.7 virtual/pkgconfig ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
+DEPEND=dev-libs/openssl:= curl? ( net-misc/curl[adns] ) dev-libs/libpcre2 dev-libs/tre >=net-dns/c-ares-1.7 virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 )
 DESCRIPTION=An advanced Internet Relay Chat daemon
 EAPI=6
 HOMEPAGE=https://www.unrealircd.org/
-IUSE=class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq showlistmodes shunnotices ssl topicisnuhost +usermod ssl
+IUSE=class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq showlistmodes shunnotices topicisnuhost +usermod
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:= ) curl? ( net-misc/curl[adns] ) dev-libs/libpcre2 dev-libs/tre >=net-dns/c-ares-1.7
+RDEPEND=dev-libs/openssl:= curl? ( net-misc/curl[adns] ) dev-libs/libpcre2 dev-libs/tre >=net-dns/c-ares-1.7
 SLOT=0
-SRC_URI=https://www.unrealircd.org/unrealircd4/unrealircd-4.0.5.tar.gz
+SRC_URI=https://www.unrealircd.org/unrealircd4/unrealircd-4.0.6.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	ssl-cert	b031e94f4c7c34e1d677376b8929821a	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1311a4f04436e166df53b921cc2e2811
+_md5_=0119e1a7a13f5ef6c90ba9b912e57eb8
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.18.6 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.18.6
new file mode 100644
index 000000000000..b2b7c12023f0
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.18.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.11.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0= app-crypt/mit-krb5 ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.3 >=dev-util/gdbus-codegen-2.30.0 >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME framework for accessing online accounts
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
+IUSE=gnome +introspection kerberos debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
+RDEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.11.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0= app-crypt/mit-krb5 )
+SLOT=0/1
+SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.18/gnome-online-accounts-3.18.6.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=283ff65cca723aa6882c6e2800a15b48
diff --git a/metadata/md5-cache/net-libs/libdmapsharing-2.9.32 b/metadata/md5-cache/net-libs/libdmapsharing-2.9.36
similarity index 57%
rename from metadata/md5-cache/net-libs/libdmapsharing-2.9.32
rename to metadata/md5-cache/net-libs/libdmapsharing-2.9.36
index b83d547bf02d..0cf1f128453f 100644
--- a/metadata/md5-cache/net-libs/libdmapsharing-2.9.32
+++ b/metadata/md5-cache/net-libs/libdmapsharing-2.9.36
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.32:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= ) dev-util/gtk-doc-am virtual/pkgconfig test? ( dev-libs/check ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.48.0:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= ) dev-util/gtk-doc-am virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A library that implements the DMAP family of protocols
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.flyn.org/projects/libdmapsharing
 IUSE=+introspection test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.32:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.48.0:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=3.0/2
-SRC_URI=http://www.flyn.org/projects/libdmapsharing/libdmapsharing-2.9.32.tar.gz
+SRC_URI=http://www.flyn.org/projects/libdmapsharing/libdmapsharing-2.9.36.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cf119d32cad01602dfe12bb643ed7e15
+_md5_=9b7dcad02d16fcf3a6ce43ca4d748b58
diff --git a/metadata/md5-cache/net-libs/wandio-1.0.4 b/metadata/md5-cache/net-libs/wandio-1.0.4
new file mode 100644
index 000000000000..db45008a6b99
--- /dev/null
+++ b/metadata/md5-cache/net-libs/wandio-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=!<net-libs/libtrace-4 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) http? ( net-misc/curl ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Library for transparent file I/O with compression
+EAPI=6
+HOMEPAGE=http://research.wand.net.nz/software/libwandio.php
+IUSE=bzip2 http lzma lzo static-libs zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<net-libs/libtrace-4 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) http? ( net-misc/curl ) zlib? ( sys-libs/zlib )
+SLOT=0/2
+SRC_URI=http://research.wand.net.nz/software/wandio/wandio-1.0.4.tar.gz
+_md5_=a015932424b4df857b95fcef08ce4199
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.12.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.12.5
new file mode 100644
index 000000000000..10c975a9798e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.12.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 dev-libs/hyphen >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=net-libs/gnutls-3 >=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] >=x11-libs/pango-1.30.0 aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 >=media-libs/gst-plugins-bad-1.6.0:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) libnotify? ( x11-libs/libnotify ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.0 dev-lang/ruby:2.1 dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) virtual/rubygems >=dev-lang/perl-5.10 >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 >=sys-devel/flex-2.5.34 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-2.8.12 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=http://www.webkitgtk.org/
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 dev-libs/hyphen >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=net-libs/gnutls-3 >=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] >=x11-libs/pango-1.30.0 aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 >=media-libs/gst-plugins-bad-1.6.0:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) libnotify? ( x11-libs/libnotify ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.12.5.tar.xz
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ruby-single	a5e86595177a8998cbb9f794f2bf9700	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3da4d1decbd034548a5c0d4a969d2e1c
diff --git a/metadata/md5-cache/net-mail/notmuch-0.22.2 b/metadata/md5-cache/net-mail/notmuch-0.22.2
new file mode 100644
index 000000000000..ef3ddd7e9441
--- /dev/null
+++ b/metadata/md5-cache/net-mail/notmuch-0.22.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-2.6.20-r2:2.6 >=dev-libs/xapian-1.2.7-r2:= dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] ) emacs? ( >=virtual/emacs-23 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
+EAPI=5
+HOMEPAGE=http://notmuchmail.org/
+IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-2.6.20-r2:2.6 >=dev-libs/xapian-1.2.7-r2:= dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] ) emacs? ( >=virtual/emacs-23 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) crypt? ( app-crypt/gnupg ) nmbug? ( dev-vcs/git ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser )
+REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) test? ( crypt emacs python valgrind )
+SLOT=0/4
+SRC_URI=http://notmuchmail.org/releases/notmuch-0.22.2.tar.gz test? ( http://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=176d2dcbf31d4bfe8a63e54a69ec5d6c
diff --git a/metadata/md5-cache/net-misc/curl-7.50.2 b/metadata/md5-cache/net-misc/curl-7.50.2
index 304f51f6fce7..ee028882454d 100644
--- a/metadata/md5-cache/net-misc/curl-7.50.2
+++ b/metadata/md5-cache/net-misc/curl-7.50.2
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=5
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.50.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=d5c70889d19336c31d3ae1c2b0866cd9
+_md5_=7b97762fea609efb4c4f26ec60810633
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2 b/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2
index 7377ba676cd1..24f63d681719 100644
--- a/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2
+++ b/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] >=media-libs/grilo-0.2.6:0.2 >=net-libs/gnome-online-accounts-3.13.3 >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins[flickr] ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] >=media-libs/grilo-0.2.6:0.2 >=net-libs/gnome-online-accounts-3.13.3 >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.2[flickr] ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Crawls through your online content
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineMiners
 IUSE=flickr
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] >=media-libs/grilo-0.2.6:0.2 >=net-libs/gnome-online-accounts-3.13.3 >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins[flickr] )
+RDEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] >=media-libs/grilo-0.2.6:0.2 >=net-libs/gnome-online-accounts-3.13.3 >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.2[flickr] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-online-miners/3.14/gnome-online-miners-3.14.3.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=613ba8ca31a67073fa1f3c6849c2d933
+_md5_=a2150baf71090bca0fd386acd30c6ede
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.20.1 b/metadata/md5-cache/net-misc/gnome-online-miners-3.20.1
new file mode 100644
index 000000000000..b988eda835ce
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-online-miners-3.20.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Crawls through your online content
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineMiners
+IUSE=flickr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-online-miners/3.20/gnome-online-miners-3.20.1.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=4b947f0e5b50077c13e29c0ac51a2799
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.4.0 b/metadata/md5-cache/net-misc/networkmanager-1.4.0
new file mode 100644
index 000000000000..b7b01c277571
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.37.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-libs/readline:0 >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) !systemd? ( !consolekit? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) ) teamd? ( >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/dbus-python[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-3.3.2-r2:3.3 dev-python/dbus-python[python_targets_python3_3(-),python_single_target_python3_3(+)] dev-python/pygobject:3[python_targets_python3_3(-),python_single_target_python3_3(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux systemd teamd test vala +wext +wifi test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.37.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-libs/readline:0 >=virtual/libgudev-165:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( dev-libs/jansson ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ofono? ( net-misc/ofono ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) !systemd? ( !consolekit? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) ) teamd? ( >=net-misc/libteam-1.9 ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.4/NetworkManager-1.4.0.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e442fdff0ff062f98fce26f7d236b058
diff --git a/metadata/md5-cache/net-misc/openvpn-2.3.12 b/metadata/md5-cache/net-misc/openvpn-2.3.12
index 942950dc189e..1a53f147898c 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.3.12
+++ b/metadata/md5-cache/net-misc/openvpn-2.3.12
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=5
 HOMEPAGE=http://openvpn.net/
 IUSE=examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD
-KEYWORDS=alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:* ) libressl? ( dev-libs/libressl ) ) polarssl? ( >=net-libs/polarssl-1.3.8 ) ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) polarssl? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.3.12.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9b275d6705ac72991ed592c5394c2ca8
+_md5_=4c06816f957f690d4730dca83cbd6dc0
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.31 b/metadata/md5-cache/net-misc/spice-gtk-0.31
index bbcfca6cffe7..e8faf3cdd989 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.31
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.31
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.31.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f
-_md5_=f67d137d2cdc9a96126afb350a1054be
+_md5_=8e53e188a1e6bb65aae654ac8cad9dd0
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.32-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.32-r1
index 4be553fa15da..b2895953a85f 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.32-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.32-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=compile configure install prepare
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) ~app-emulation/spice-protocol-0.12.11 dev-perl/Text-CSV >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=5
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.32.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f
-_md5_=d65f7ec462787f2631570c9914c568a8
+_md5_=648a909d50c52ad87882a35ecd9f4bc7
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.32-r2 b/metadata/md5-cache/net-misc/spice-gtk-0.32-r2
index 9725c74adf44..388be3b5b358 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.32-r2
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.32-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=compile configure install prepare
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) >=app-emulation/spice-protocol-0.12.11 dev-perl/Text-CSV >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=5
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.32.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f
-_md5_=74b9cdbe2045e4af0f33b1b258605dcb
+_md5_=c73d197a776acba465224eefc63154c3
diff --git a/metadata/md5-cache/net-misc/spice-gtk-9999 b/metadata/md5-cache/net-misc/spice-gtk-9999
index 79e82aac5bf4..44801c9a2b0e 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-9999
+++ b/metadata/md5-cache/net-misc/spice-gtk-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) =app-emulation/spice-protocol-9999 dev-perl/Text-CSV >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pu
 REQUIRED_USE=?? ( pulseaudio gstaudio )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f
-_md5_=00be6cbc0f573367833398d4d90bcd66
+_md5_=69ff84b2797e884ab6f300678dafd310
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2016.09.04.1 b/metadata/md5-cache/net-misc/youtube-dl-2016.09.04.1
index 2c148d71ad32..c92d5c0b0dbe 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.09.04.1
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.09.04.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2016.09.04.1/youtube-dl-2016.09.04.1.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3880f3c8d8bee92d445f6edd22b391a5
+_md5_=bb2037b22aa1c8b19c923b4c020324b0
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2016.09.03 b/metadata/md5-cache/net-misc/youtube-dl-2016.09.08
similarity index 67%
rename from metadata/md5-cache/net-misc/youtube-dl-2016.09.03
rename to metadata/md5-cache/net-misc/youtube-dl-2016.09.08
index 045e9142d592..56b2f8955a12 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.09.03
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.09.08
@@ -6,9 +6,9 @@ HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=offensive test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2016.09.03/youtube-dl-2016.09.03.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2016.09.08/youtube-dl-2016.09.08.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3880f3c8d8bee92d445f6edd22b391a5
+_md5_=bb2037b22aa1c8b19c923b4c020324b0
diff --git a/metadata/md5-cache/net-misc/youtube-dl-99999999 b/metadata/md5-cache/net-misc/youtube-dl-99999999
index f58d46195696..0c05b960c136 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-99999999
+++ b/metadata/md5-cache/net-misc/youtube-dl-99999999
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
 LICENSE=public-domain
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d1cb1a3f58de938d6722250ae697d7d4
+_md5_=b3f119a49e3967d610835db1ec58ef40
diff --git a/metadata/md5-cache/sci-biology/rebase-1609 b/metadata/md5-cache/sci-biology/rebase-1609
new file mode 100644
index 000000000000..fedb08e990bb
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/rebase-1609
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+DESCRIPTION=A restriction enzyme database
+EAPI=6
+HOMEPAGE=http://rebase.neb.com
+IUSE=emboss minimal
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/rebase-1609.tar.xz
+_md5_=3ef363b2e2336edb20236893d366da28
diff --git a/metadata/md5-cache/sci-libs/gerris-20120731 b/metadata/md5-cache/sci-libs/gerris-20120731
deleted file mode 100644
index f723cde9c834..000000000000
--- a/metadata/md5-cache/sci-libs/gerris-20120731
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Gerris Flow Solver
-EAPI=4
-HOMEPAGE=http://gfs.sourceforge.net/
-IUSE=examples mpi static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://gerris.dalembert.upmc.fr/gerris/tarballs/gerris-snapshot-120731.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=9f41ada73f4fd3c5123f9f2388b18389
diff --git a/metadata/md5-cache/sci-libs/gerris-20130531 b/metadata/md5-cache/sci-libs/gerris-20130531
deleted file mode 100644
index d0a35a90764a..000000000000
--- a/metadata/md5-cache/sci-libs/gerris-20130531
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Gerris Flow Solver
-EAPI=5
-HOMEPAGE=http://gfs.sourceforge.net/
-IUSE=examples mpi static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://gerris.dalembert.upmc.fr/gerris/tarballs/gerris-snapshot-130531.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=6993ce74cd63e04d7d7399045574b292
diff --git a/metadata/md5-cache/sci-libs/gerris-20131206 b/metadata/md5-cache/sci-libs/gerris-20131206
deleted file mode 100644
index 22b987880f6a..000000000000
--- a/metadata/md5-cache/sci-libs/gerris-20131206
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Gerris Flow Solver
-EAPI=5
-HOMEPAGE=http://gfs.sourceforge.net/
-IUSE=examples mpi static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://gerris.dalembert.upmc.fr/gerris/tarballs/gerris-snapshot-131206.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=959f7856146ace868f4bd94337968435
diff --git a/metadata/md5-cache/sci-libs/gerris-20131206-r1 b/metadata/md5-cache/sci-libs/gerris-20131206-r1
new file mode 100644
index 000000000000..d5531cffeb84
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/gerris-20131206-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf:= sci-libs/gsl:= sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj sci-libs/fftw:3.0= virtual/lapack mpi? ( virtual/mpi ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Gerris Flow Solver
+EAPI=6
+HOMEPAGE=http://gfs.sourceforge.net/
+IUSE=examples mpi static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-games/ode sci-libs/netcdf:= sci-libs/gsl:= sci-libs/gts sci-libs/hypre[mpi?] sci-libs/lis[mpi?] sci-libs/proj sci-libs/fftw:3.0= virtual/lapack mpi? ( virtual/mpi )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://gerris.dalembert.upmc.fr/gerris/tarballs/gerris-snapshot-131206.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=cabdf3cfe7ed1f26ff4e2dd43c4f6862
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.4 b/metadata/md5-cache/sci-libs/libcerf-1.4
index 57e112c832b5..78e27b5293dc 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.4
+++ b/metadata/md5-cache/sci-libs/libcerf-1.4
@@ -3,9 +3,9 @@ DESCRIPTION=library that provides an efficient and accurate implementation of co
 EAPI=5
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.4.tgz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=fa18d333aa0a3bd8ae3384e2ed0bbb4e
+_md5_=e29440e76e63f9384faaabc7e7d3d69f
diff --git a/metadata/md5-cache/sci-libs/lis-1.6.2 b/metadata/md5-cache/sci-libs/lis-1.6.5
similarity index 94%
rename from metadata/md5-cache/sci-libs/lis-1.6.2
rename to metadata/md5-cache/sci-libs/lis-1.6.5
index 28a16a3da801..e1659edb5fff 100644
--- a/metadata/md5-cache/sci-libs/lis-1.6.2
+++ b/metadata/md5-cache/sci-libs/lis-1.6.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
-SRC_URI=http://www.ssisc.org/lis/dl/lis-1.6.2.tar.gz
+SRC_URI=http://www.ssisc.org/lis/dl/lis-1.6.5.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
 _md5_=123467aaa2ce5c9a07d22130819b53da
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.0.0 b/metadata/md5-cache/sci-mathematics/octave-4.0.0
index f8bb9b036e0a..944ad595cff2 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.0.0
+++ b/metadata/md5-cache/sci-mathematics/octave-4.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
 HOMEPAGE=http://www.octave.org/
-IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0/4.0.0
 SRC_URI=mirror://gnu/octave/octave-4.0.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e704df9faf5ed6149b14813d13de2b5f
+_md5_=cfa0955bb6bce4aa60bd1e3030bd4dd4
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.0.0-r1 b/metadata/md5-cache/sci-mathematics/octave-4.0.0-r1
index 9e88976a4c7c..27f2fd119939 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.0.0-r1
+++ b/metadata/md5-cache/sci-mathematics/octave-4.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
 HOMEPAGE=http://www.octave.org/
-IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0/4.0.0
 SRC_URI=mirror://gnu/octave/octave-4.0.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=798677adfae2ea5343c34dd164b7ddef
+_md5_=3fd8d9b4c01c3998ff4a3d9a6d1278b0
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.0.1 b/metadata/md5-cache/sci-mathematics/octave-4.0.1
index 6ae3f3d1e51d..72a8a783fb89 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.0.1
+++ b/metadata/md5-cache/sci-mathematics/octave-4.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
 HOMEPAGE=http://www.octave.org/
-IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0/4.0.1
 SRC_URI=mirror://gnu/octave/octave-4.0.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e704df9faf5ed6149b14813d13de2b5f
+_md5_=cfa0955bb6bce4aa60bd1e3030bd4dd4
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.0.1-r1 b/metadata/md5-cache/sci-mathematics/octave-4.0.1-r1
index ea311802de92..af6bdc2b34a1 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.0.1-r1
+++ b/metadata/md5-cache/sci-mathematics/octave-4.0.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
 HOMEPAGE=http://www.octave.org/
-IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0/4.0.1
 SRC_URI=mirror://gnu/octave/octave-4.0.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b72e7777dcdf4539c1595261d81a793
+_md5_=af1b939ca576fb74124416b573b5e390
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.0.2-r2 b/metadata/md5-cache/sci-mathematics/octave-4.0.2-r2
index eae2ad991b74..fd55643ec5a8 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.0.2-r2
+++ b/metadata/md5-cache/sci-mathematics/octave-4.0.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
 HOMEPAGE=http://www.octave.org/
-IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0/4.0.2
 SRC_URI=mirror://gnu/octave/octave-4.0.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7b72e7777dcdf4539c1595261d81a793
+_md5_=af1b939ca576fb74124416b573b5e390
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.0.3 b/metadata/md5-cache/sci-mathematics/octave-4.0.3
index b71b7b805be8..ba6f5a619fbb 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.0.3
+++ b/metadata/md5-cache/sci-mathematics/octave-4.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) 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 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=6
 HOMEPAGE=http://www.octave.org/
-IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) 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 ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0/4.0.3
 SRC_URI=mirror://gnu/octave/octave-4.0.3.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=53b94a3ede5823ddf4536382cd1189d4
+_md5_=038db0a2bf46463819d16c89c5c02843
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
index e1d83ecba145..2b08e704874f 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=5
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline:0 ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.0.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=5c9513cb26d20a1fa586db61f755531e
+_md5_=98ecdc40c0d7b33330107bf91ca977aa
diff --git a/metadata/md5-cache/sys-apps/dtc-1.4.2 b/metadata/md5-cache/sys-apps/dtc-1.4.2
new file mode 100644
index 000000000000..31fac9a6ef93
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dtc-1.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-devel/bison sys-devel/flex
+DESCRIPTION=Open Firmware device tree compiler
+EAPI=6
+HOMEPAGE=http://devicetree.org/Device_Tree_Compiler
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://kernel/software/utils/dtc/dtc-1.4.2.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=b1868fbc4a1077782f1d58f48fb68850
diff --git a/metadata/md5-cache/sys-apps/dtc-9999 b/metadata/md5-cache/sys-apps/dtc-9999
index 3f9584a23315..adaac29930dd 100644
--- a/metadata/md5-cache/sys-apps/dtc-9999
+++ b/metadata/md5-cache/sys-apps/dtc-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/xz-utils sys-devel/flex sys-devel/bison dev-vcs/git
+DEPEND=sys-devel/bison sys-devel/flex >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Open Firmware device tree compiler
-EAPI=5
+EAPI=6
 HOMEPAGE=http://devicetree.org/Device_Tree_Compiler
 IUSE=static-libs
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=git-2	7af5d170bfc02983b4bcd3167dc5edd4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=1ebf07faef11bf1baa3f1462824acb04
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=b1868fbc4a1077782f1d58f48fb68850
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.0 b/metadata/md5-cache/sys-apps/texinfo-6.3
similarity index 84%
rename from metadata/md5-cache/sys-apps/texinfo-6.0
rename to metadata/md5-cache/sys-apps/texinfo-6.3
index 3ad7c67c32b9..672cec7ce512 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.0
+++ b/metadata/md5-cache/sys-apps/texinfo-6.3
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure
+DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl ) app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19.6 )
 DESCRIPTION=The GNU info program and utilities
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/texinfo/
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=mirror://gnu/texinfo/texinfo-6.0.tar.xz
+SRC_URI=mirror://gnu/texinfo/texinfo-6.3.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=a3a35cbe9113907e436135768b9fa610
+_md5_=1085e7805e9947fb7a12ee8a435740a2
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index 21f60bc6db7b..a87da4c16ced 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -9,6 +9,6 @@ RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= debug? ( sdl? ( media-lib
 REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
 RESTRICT=strip test
 SLOT=2/9999
-SRC_URI=fonts? ( mirror://gnu/unifont/unifont-9.0.01/unifont-9.0.01.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
+SRC_URI=fonts? ( mirror://gnu/unifont/unifont-9.0.02/unifont-9.0.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7de307782cbac1ac603b515d4ea4e39f
+_md5_=88c0d2d54eb4eb7d06b2ee0a4bcff89d
diff --git a/metadata/md5-cache/sys-cluster/cinder-8.0.0 b/metadata/md5-cache/sys-cluster/cinder-8.0.0
deleted file mode 100644
index 48dc9ec686b1..000000000000
--- a/metadata/md5-cache/sys-cluster/cinder-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
-EAPI=6
-HOMEPAGE=https://launchpad.net/cinder
-IUSE=+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-vmware-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tooz-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] iscsi? ( sys-block/tgt sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/cinder/cinder-8.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/cinder.conf.sample -> mitaka-cinder.conf.sample https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/api-paste.ini -> mitaka-cinder-api-paste.ini https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/policy.json -> mitaka-cinder-policy.json https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/volume.filters -> mitaka-cinder-volume.filters
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=43746bdadeb967e2a30f4c040123c3e1
diff --git a/metadata/md5-cache/sys-cluster/cinder-8.1.0 b/metadata/md5-cache/sys-cluster/cinder-8.1.0
index 47424e00d7d7..b2bb03e916ef 100644
--- a/metadata/md5-cache/sys-cluster/cinder-8.1.0
+++ b/metadata/md5-cache/sys-cluster/cinder-8.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-vo
 EAPI=6
 HOMEPAGE=https://launchpad.net/cinder
 IUSE=+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/Babel-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/Babel-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/Babel-2.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/Babel-2.3.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/python-keystoneclient-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-vmware-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/os-brick-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tooz-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] iscsi? ( sys-block/tgt sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/cinder/cinder-8.1.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/cinder.conf.sample -> mitaka-cinder.conf.sample https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/api-paste.ini -> mitaka-cinder-api-paste.ini https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/policy.json -> mitaka-cinder-policy.json https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/volume.filters -> mitaka-cinder-volume.filters
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c6c885b05d72f162e530a1eeab1b25c4
+_md5_=f4b3358a783b8d8d54902b4d184bdeb7
diff --git a/metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1 b/metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
new file mode 100644
index 000000000000..622067f726e6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=mpi? ( virtual/mpi ) !<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=Networking middleware for partitioned global address space (PGAS) language
+EAPI=6
+HOMEPAGE=http://gasnet.lbl.gov/
+IUSE=mpi static-libs threads
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0/1
+SRC_URI=http://gasnet.lbl.gov/GASNet-1.26.4.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=d33a41be5bae0c9c074b09798f05d790
diff --git a/metadata/md5-cache/sys-cluster/legion-16.08.0 b/metadata/md5-cache/sys-cluster/legion-16.08.0-r1
similarity index 78%
rename from metadata/md5-cache/sys-cluster/legion-16.08.0
rename to metadata/md5-cache/sys-cluster/legion-16.08.0-r1
index a3340868bbfc..40534eb7b777 100644
--- a/metadata/md5-cache/sys-cluster/legion-16.08.0
+++ b/metadata/md5-cache/sys-cluster/legion-16.08.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gasnet? ( sys-cluster/gasnet ) hwloc? ( sys-apps/hwloc ) sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) hwloc? ( sys-apps/hwloc ) sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=A data-centric parallel programming system
 EAPI=6
 HOMEPAGE=http://legion.stanford.edu/
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-16.08.0.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e7af11d4def2ceb5a60d606a18d1d1d
+_md5_=98b30461f2a3aa5482aa8d764846c733
diff --git a/metadata/md5-cache/sys-cluster/nova-13.1.0 b/metadata/md5-cache/sys-cluster/nova-13.1.0
deleted file mode 100644
index 548d193bc8ef..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-13.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo 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=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-neutronclient-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websockify-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rfc3986-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-brick-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/castellan-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( <=net-misc/openvswitch-2.5.9999 ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached <=dev-python/python-memcached-1.57 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrkit sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.872-r3 ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/nova/nova-13.1.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/mitaka/nova.conf.sample -> mitaka-nova.conf.sample
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=aea4062caa51361e64fccb82c6a3aba0
diff --git a/metadata/md5-cache/sys-cluster/nova-13.1.1 b/metadata/md5-cache/sys-cluster/nova-13.1.1
index 878d3d035ce8..03b635e72688 100644
--- a/metadata/md5-cache/sys-cluster/nova-13.1.1
+++ b/metadata/md5-cache/sys-cluster/nova-13.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in P
 EAPI=6
 HOMEPAGE=https://launchpad.net/nova
 IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-neutronclient-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websockify-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-3.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rfc3986-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-brick-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/os-brick-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/castellan-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( <=net-misc/openvswitch-2.5.9999 ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached <=dev-python/python-memcached-1.57 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrkit sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.872-r3 ) 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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/nova/nova-13.1.1.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/mitaka/nova.conf.sample -> mitaka-nova.conf.sample
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=82f0a5629d191c663423983c814017b0
+_md5_=cebd9a7235e4b003f97791c0111c85bc
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2 b/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
index 30091b06a5be..00956c375430 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 4.3
-EAPI=3
+EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm )
 SLOT=4
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-128.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-822.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-855.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-195.6.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=1526e2e7ca4fed2776f20e738bd96f01
+_md5_=1314973369be05319e95f766144a2b3b
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
index 336fbe346f4c..4efa2061d4ec 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) libcxx? ( sys-devel/llvm )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 5.1
-EAPI=3
+EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/lib
 SLOT=5
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-236.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-855.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=a1350c13e02c12553e4d55f67252105f
+_md5_=5b1956ef47f388e83a62474a82ee7fe9
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
index 51268ef3f102..810bd399a47f 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) libcxx? ( sys-devel/llvm )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 6.1
-EAPI=3
+EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/lib
 SLOT=6
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-241.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-862.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=990484cec6304608fc845979a1d30059
+_md5_=ceb1c447ff940870f3f555e7ddcdadfe
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1 b/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1
index bacee3038cf3..a4663fe75882 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/lib
 SLOT=6
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-242.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-870.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=800b4b8bbf68da6aba7b4d301fdbe610
+_md5_=b0a3c23a412edd1b28c50ec35143b806
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.0 b/metadata/md5-cache/sys-devel/binutils-apple-7.0
index bd6e04115a10..bf06c093f254 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.0
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.0
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.5.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.14.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=be954b1f1b27fe4fb0e03288f980c894
+_md5_=7ecc97af713d7bcfab953d144853acd7
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
index c8fd8483d3ae..e5449d4d4d11 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.5.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.14.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=a22a1a301cb13e864e17964976ed1edf
+_md5_=2733237a5d9913bf7744073be16645ae
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.1 b/metadata/md5-cache/sys-devel/binutils-apple-7.1
index e04adcbe3c21..6b35cbabdea8 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.1
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.6.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.7.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.17.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=31035cb96762684353774294b0c22800
+_md5_=f3a136129eb8edfec86e462da48ac683
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
index 5cb936f6baf0..3f6c4bf4c5d8 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.6.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.7.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.17.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=1aeeaf924871bb26ba9eac896a99b5c5
+_md5_=c10a092950623a80017a18be10f74a24
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.2 b/metadata/md5-cache/sys-devel/binutils-apple-7.2
index 50c7f568bdcb..349cd95cbfcb 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.2
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.8.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r1.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=ff07b838cd593b5f652ca8d75ac8437c
+_md5_=f140704a8221e54f0af24dc2dca672ef
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
index 800891acc951..e22d8d22e977 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.8.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=95edd05d3d12c3e6cfda3e3436c1b18d
+_md5_=aa96fd47cbea53112adfa2e18c22e5ce
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.3 b/metadata/md5-cache/sys-devel/binutils-apple-7.3
index 35df20a866cd..6f356addddac 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.3
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.3
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-264.3.101.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-886.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r0.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=3702bb82da8831d8066f9870c77f9f54
+_md5_=3c65dac07b1aa44253c27621c419dba7
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.3.1 b/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
index 2731d803e364..d8755861f959 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-264.3.102.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-886.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r0.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=1d0b3cffad483b52bbd7f356c05139d1
+_md5_=a7f2a82a03be00cd76aa68a7437253c2
diff --git a/metadata/md5-cache/sys-devel/clang-3.4.2-r100 b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
new file mode 100644
index 000000000000..a8de2cfa093e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst postrm
+DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
+EAPI=5
+HOMEPAGE=http://clang.llvm.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-3.4.2[clang(-),abi_x86_32(-)?,abi_x86_64(-)?,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/3.4
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=b2a80660261dc93b80e494a824b5f929
diff --git a/metadata/md5-cache/sys-devel/clang-3.5.0-r100 b/metadata/md5-cache/sys-devel/clang-3.5.0-r100
index 0c67aa5cc011..be774b1f1386 100644
--- a/metadata/md5-cache/sys-devel/clang-3.5.0-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.5.0-r100
@@ -3,9 +3,9 @@ DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
 EAPI=5
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.5.0[clang(-),debug=,multitarget?,python?,static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,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/3.5
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=8c74e09fa634c8c494beb3c847e23709
+_md5_=342f6df701c23ad33700cc0e2ac2e7f9
diff --git a/metadata/md5-cache/sys-devel/clang-3.5.2-r100 b/metadata/md5-cache/sys-devel/clang-3.5.2-r100
index 7e22092afae5..809770c62b93 100644
--- a/metadata/md5-cache/sys-devel/clang-3.5.2-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.5.2-r100
@@ -3,9 +3,9 @@ DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
 EAPI=5
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.5.2[clang(-),debug=,multitarget?,python?,static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,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/3.5
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=516d1aab0527ec57a7b71f06c51ed225
+_md5_=90ba3667be7addd783456ca033608c09
diff --git a/metadata/md5-cache/sys-devel/clang-3.6.2-r100 b/metadata/md5-cache/sys-devel/clang-3.6.2-r100
index 373ffbc87b85..f6b902191e32 100644
--- a/metadata/md5-cache/sys-devel/clang-3.6.2-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.6.2-r100
@@ -3,9 +3,9 @@ DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
 EAPI=5
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.6.2[clang(-),debug=,multitarget?,python?,static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,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/3.6
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=bbc9d56d2e73676ac74d4936cf5a6309
+_md5_=24f91fef5352deb4fc012bffee8251f8
diff --git a/metadata/md5-cache/sys-devel/clang-3.7.1-r100 b/metadata/md5-cache/sys-devel/clang-3.7.1-r100
index 775c73e145c5..67b0cdf53b1d 100644
--- a/metadata/md5-cache/sys-devel/clang-3.7.1-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.7.1-r100
@@ -3,9 +3,9 @@ DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
 EAPI=5
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.7.1[clang(-),debug=,multitarget?,python?,static-analyzer?,abi_x86_32(-)?,abi_x86_64(-)?,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/3.7
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=909ae18bb9104130963936c846ba1e67
+_md5_=c8818acabd76b5b570faaa649c5e2a59
diff --git a/metadata/md5-cache/sys-devel/clang-3.8.0-r100 b/metadata/md5-cache/sys-devel/clang-3.8.0-r100
index dd6a9703622b..6142a5835f1f 100644
--- a/metadata/md5-cache/sys-devel/clang-3.8.0-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.8.0-r100
@@ -3,9 +3,9 @@ DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
 EAPI=5
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.8.0[clang(-),debug=,multitarget?,python?,static-analyzer?,abi_x86_32(-)?,abi_x86_64(-)?,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/3.8
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=cf1521d81b78b1da33988e2a26844079
+_md5_=13c6fa36e2217189fbafd3edbda9dbdd
diff --git a/metadata/md5-cache/sys-devel/clang-3.8.1-r100 b/metadata/md5-cache/sys-devel/clang-3.8.1-r100
index 967247f6c329..c6154f2b6296 100644
--- a/metadata/md5-cache/sys-devel/clang-3.8.1-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.8.1-r100
@@ -3,9 +3,9 @@ DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
 EAPI=5
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.8.1[clang(-),debug=,multitarget?,python?,static-analyzer?,abi_x86_32(-)?,abi_x86_64(-)?,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/3.8
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=cf1521d81b78b1da33988e2a26844079
+_md5_=13c6fa36e2217189fbafd3edbda9dbdd
diff --git a/metadata/md5-cache/sys-devel/clang-3.9.0-r100 b/metadata/md5-cache/sys-devel/clang-3.9.0-r100
index c2e675b49a4c..83ee13640895 100644
--- a/metadata/md5-cache/sys-devel/clang-3.9.0-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.9.0-r100
@@ -3,9 +3,9 @@ DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
 EAPI=5
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.9.0[clang(-),debug=,multitarget?,python?,static-analyzer?,abi_x86_32(-)?,abi_x86_64(-)?,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/3.8
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=a15bfd40f27780da61209c816d6240dd
+_md5_=58a574d145755d731644c8d8e1ab89f8
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493 b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
index 496412b52d7f..ea1a20059e40 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=sys-apps/sed-4 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DESCRIPTION=Apple branch of the GNU Compiler Collection, Developer Tools 3.1.3
-EAPI=3
+EAPI=5
 HOMEPAGE=https://gcc.gnu.org
 IUSE=nls objc objc++ +cxx regression-test vanilla +nls +nptl
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=40
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5493.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fixheadtails	2f44773656577fe2653bacc8bdcb2174	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnuconfig	3920de1188fc7bfee873515453ed1d10	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain	dfddbc4d65d64fa179b5d8fa21b95a77	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=72320c2e6419904847ffa16237d79914
+_md5_=05e29f8ff576beaf405b4effadd8f991
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
index b078511ac76f..9809c16a1921 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 >=sys-apps/sed-4 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) !<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=Apple branch of the GNU Compiler Collection, Developer Tools 3.2.3
-EAPI=3
+EAPI=5
 HOMEPAGE=https://gcc.gnu.org
 IUSE=fortran nls +openmp objc objc++ +cxx regression-test vanilla +nls +nptl
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5664.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fixheadtails	2f44773656577fe2653bacc8bdcb2174	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnuconfig	3920de1188fc7bfee873515453ed1d10	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain	dfddbc4d65d64fa179b5d8fa21b95a77	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=32553d82faddfe6535d95d573aa9a85b
+_md5_=c18962d2ddac3b4340114dc2ae672bcd
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
index 6c3f3e9b0fd9..f5d829c9f360 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 sys-libs/csu fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 >=sys-apps/sed-4 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) !<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=Apple branch of the GNU Compiler Collection, Developer Tools 4.0
-EAPI=3
+EAPI=5
 HOMEPAGE=https://gcc.gnu.org
 IUSE=fortran nls +openmp objc objc++ +cxx regression-test vanilla +nls +nptl
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fixheadtails	2f44773656577fe2653bacc8bdcb2174	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnuconfig	3920de1188fc7bfee873515453ed1d10	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain	dfddbc4d65d64fa179b5d8fa21b95a77	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=10cb6e5c91b58d99edf1f4b50d839b2b
+_md5_=cc4b635475823ad3d8eb8c1f3fdfe7ef
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index eec3f3132fed..23538d2834a3 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.8-r1 sys-libs/csu !<sys-apps/portage-2.2.14 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 >=sys-apps/sed-4 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) !<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=Apple branch of the GNU Compiler Collection, Developer Tools 4.0
-EAPI=3
+EAPI=5
 HOMEPAGE=https://gcc.gnu.org
 IUSE=fortran nls +openmp objc objc++ +cxx regression-test vanilla +nls +nptl
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fixheadtails	2f44773656577fe2653bacc8bdcb2174	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnuconfig	3920de1188fc7bfee873515453ed1d10	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	toolchain	dfddbc4d65d64fa179b5d8fa21b95a77	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=960c6b6f5af4eed552c71207f25f1adf
+_md5_=b6f7b1da1dbf7321f97a9765e861ee52
diff --git a/metadata/md5-cache/sys-devel/llvm-3.4.2-r100 b/metadata/md5-cache/sys-devel/llvm-3.4.2-r100
new file mode 100644
index 000000000000..403dac6b0c5a
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-3.4.2-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare pretend setup unpack
+DEPEND=sys-libs/zlib:0= libffi? ( >=virtual/libffi-3.0.13-r1:0= ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-apple-4.2.1 >=sys-devel/llvm-3.3 ) >=sys-devel/binutils-apple-5.1 libffi? ( virtual/pkgconfig ) || ( >=dev-lang/python-2.7.5-r2:2.7 )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=5
+HOMEPAGE=http://llvm.org/
+IUSE=clang +libffi
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
+LICENSE=UoI-NCSA
+PDEPEND=clang? ( =sys-devel/clang-3.4.2-r100 )
+RDEPEND=sys-libs/zlib:0= libffi? ( >=virtual/libffi-3.0.13-r1:0= ) clang? ( !<=sys-devel/clang-3.4.2-r99 !>=sys-devel/clang-9999 )
+SLOT=0/3.4
+SRC_URI=http://llvm.org/releases/3.4.2/llvm-3.4.2.src.tar.gz clang? ( http://llvm.org/releases/3.4.2/compiler-rt-3.4.src.tar.gz http://llvm.org/releases/3.4.2/cfe-3.4.2.src.tar.gz ) https://dev.gentoo.org/~mgorny/dist/llvm-3.4-manpages.tar.bz2
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=f3fb578dd7aca39e9e024b135c2ab3ef
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.2 b/metadata/md5-cache/sys-devel/llvm-3.5.2
index d4cb9f78e0f8..3a50a81f270e 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) static-analyzer? ( dev-lang/perl:* 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(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( dev-lang/ocaml:0= ) app-arch/xz-utils dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.3 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-3.5.2.9999 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) static-analyzer? ( dev-lang/perl:* 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(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( dev-lang/ocaml:0= ) app-arch/xz-utils dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.3 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Low Level Virtual Machine
 EAPI=5
 HOMEPAGE=http://llvm.org/
 IUSE=clang debug doc gold libedit +libffi multitarget ncurses ocaml python +static-analyzer test xml video_cards_radeon kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_pypy python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-3.5.2-r100 )
+PDEPEND=clang? ( =sys-devel/clang-3.5.2-r100 ) kernel_Darwin? ( =sys-libs/libcxx-3.5* )
 RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) static-analyzer? ( dev-lang/perl:* 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(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( dev-lang/ocaml:0= ) clang? ( !<=sys-devel/clang-3.5.2-r99 !>=sys-devel/clang-9999 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.5
 SRC_URI=http://llvm.org/releases/3.5.2/llvm-3.5.2.src.tar.xz clang? ( http://llvm.org/releases/3.5.2/compiler-rt-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/cfe-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/clang-tools-extra-3.5.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=c9d08f184c450060e96088dd852cd3f4
+_md5_=334b71cfe044765ad5534005c102d245
diff --git a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3 b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
index d1d18ddc9a49..6e223565ae36 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
+++ b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-3.7.1.9999 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
+DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
 DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=http://llvm.org/
 IUSE=clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml python +static-analyzer test xml video_cards_radeon kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
 KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-3.7.1-r100 )
+PDEPEND=clang? ( =sys-devel/clang-3.7.1-r100 ) kernel_Darwin? ( =sys-libs/libcxx-3.7.1* )
 RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.7.1-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.7.1
 SRC_URI=http://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz clang? ( http://llvm.org/releases/3.7.1/compiler-rt-3.7.1.src.tar.xz http://llvm.org/releases/3.7.1/cfe-3.7.1.src.tar.xz http://llvm.org/releases/3.7.1/clang-tools-extra-3.7.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.7.1/lldb-3.7.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.7.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=de5503f12f66ba43d69ca5cfca963cab
+_md5_=a2fd02db2bc1db328dea464a4edc5749
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.1 b/metadata/md5-cache/sys-devel/llvm-3.8.1
index a3a95f91312f..f90cf009449b 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-3.8.1.9999 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
+DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
 DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=http://llvm.org/
 IUSE=clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml python +static-analyzer test xml video_cards_radeon kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-3.8.1-r100 )
+PDEPEND=clang? ( =sys-devel/clang-3.8.1-r100 ) kernel_Darwin? ( =sys-libs/libcxx-3.8* )
 RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.8.1-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.8.0
 SRC_URI=http://llvm.org/releases/3.8.1/llvm-3.8.1.src.tar.xz clang? ( http://llvm.org/releases/3.8.1/compiler-rt-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/cfe-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/clang-tools-extra-3.8.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.8.1/lldb-3.8.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2d6180800ee33db9c243aef9b09c367d
+_md5_=89a384ceb0da1c24a361a7bc93bd41bb
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.1-r2 b/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
index 3dcdee504198..18b64ca9d05e 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-3.8.1.9999 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
+DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( dev-ml/findlib test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
 DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=http://llvm.org/
 IUSE=clang debug default-compiler-rt default-libcxx doc gold libedit +libffi lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-3.8.1-r100 ) default-libcxx? ( sys-libs/libcxx )
-RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.8.1-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+PDEPEND=clang? ( =sys-devel/clang-3.8.1-r100 ) default-libcxx? ( sys-libs/libcxx ) kernel_Darwin? ( =sys-libs/libcxx-3.8* )
+RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.8.1-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.8.0
 SRC_URI=http://llvm.org/releases/3.8.1/llvm-3.8.1.src.tar.xz clang? ( http://llvm.org/releases/3.8.1/compiler-rt-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/cfe-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/clang-tools-extra-3.8.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.8.1/lldb-3.8.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b7bbbf715a979b106d6ab4347d1700f
+_md5_=f2461e620496a402394bd40146104caf
diff --git a/metadata/md5-cache/sys-devel/llvm-3.9.0 b/metadata/md5-cache/sys-devel/llvm-3.9.0
index ba0d408d1b0b..45c2e7925107 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.9.0
+++ b/metadata/md5-cache/sys-devel/llvm-3.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-3.9.0.9999 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.6.1-r1
+DEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-3.9.0.9999 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!<dev-python/configparser-3.3.0.2 ocaml? ( dev-ml/findlib test? ( dev-ml/ounit ) ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.6.1-r1
 DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=http://llvm.org/
 IUSE=clang debug default-compiler-rt default-libcxx doc gold libedit +libffi lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml video_cards_radeon elibc_musl kernel_Darwin kernel_FreeBSD abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=UoI-NCSA
-PDEPEND=clang? ( =sys-devel/clang-3.9.0-r100 ) default-libcxx? ( sys-libs/libcxx )
-RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.9.0-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+PDEPEND=clang? ( =sys-devel/clang-3.9.0-r100 ) default-libcxx? ( sys-libs/libcxx ) kernel_Darwin? ( =sys-libs/libcxx-3.9* )
+RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.9.0-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.9.0
 SRC_URI=http://llvm.org/releases/3.9.0/llvm-3.9.0.src.tar.xz clang? ( http://llvm.org/releases/3.9.0/compiler-rt-3.9.0.src.tar.xz http://llvm.org/releases/3.9.0/cfe-3.9.0.src.tar.xz http://llvm.org/releases/3.9.0/clang-tools-extra-3.9.0.src.tar.xz ) lldb? ( http://llvm.org/releases/3.9.0/lldb-3.9.0.src.tar.xz ) !doc? ( http://dev.gentoo.org/~mgorny/dist/llvm-3.9.0_rc3-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6a45ab44eec292adaf550c6d79f3cdbe
+_md5_=6216eaaf203249654fe9aec18cfac193
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 5c392645e63c..07a002b8f7fa 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-9999.9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) ocaml? ( test? ( dev-ml/ounit ) ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.6.1-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-9999.9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) ocaml? ( dev-ml/findlib test? ( dev-ml/ounit ) ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.6.1-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=http://llvm.org/
 IUSE=debug +doc gold libedit +libffi multitarget ncurses ocaml test video_cards_radeon elibc_musl kernel_Darwin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=UoI-NCSA
-RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes )
+RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= )
 SLOT=0/9999
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4525daa23cdaf2b374f3c6b713f174f6
+_md5_=277f47c4b14fbc88d0e664bdc204e4f2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.13 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.40
similarity index 62%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.4.13
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.18.40
index ef3ac3c02f0a..480dc93ceecc 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.40
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
+DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
+IUSE=deblob experimental module vanilla symlink build
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
+PDEPEND==sys-fs/aufs-util-3*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160627.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-15.base.tar.xz mirror://gentoo/genpatches-4.4-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-15.experimental.tar.xz ) )
+SLOT=3.18.40
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.25+_p20160822.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-40.base.tar.xz mirror://gentoo/genpatches-3.18-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-40.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f56308d3ad87ede270429f65764efef1
+_md5_=91a4f7adb34c893e06c7a1504564731f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.14
deleted file mode 100644
index 51b7941746c6..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160627.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-16.base.tar.xz mirror://gentoo/genpatches-4.4-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-16.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=974b1092e4aeb8b2ab5c26ee8e192dca
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.15 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.15
deleted file mode 100644
index ede74f029b42..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.15
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160801.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-17.base.tar.xz mirror://gentoo/genpatches-4.4-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-17.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b53c9c5789a640c357c20bc1b51aa88
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.16 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.16
deleted file mode 100644
index 7939ebeb0fa3..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.16
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160801.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-18.base.tar.xz mirror://gentoo/genpatches-4.4-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-18.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b32738524a5ca38d8301dd37e3cff788
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.17 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.17
deleted file mode 100644
index df38e48c9f27..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.17
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.17
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160815.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-19.base.tar.xz mirror://gentoo/genpatches-4.4-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-19.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bb945bf3f61a43c45ff85b9a0d57dbd9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.20
similarity index 77%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.4.12
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.4.20
index c93bd2471899..ccb35a1db472 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.12
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.20
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160627.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-14.base.tar.xz mirror://gentoo/genpatches-4.4-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-14.experimental.tar.xz ) )
+SLOT=4.4.20
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20160905.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-22.base.tar.xz mirror://gentoo/genpatches-4.4-22.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-22.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fed67e7de6b269271857bfccf28dc763
+_md5_=8b93db4b872e38c76b4c703d0d14fd2a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.3 b/metadata/md5-cache/sys-kernel/aufs-sources-4.6.3
deleted file mode 100644
index f76c57264d05..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.6.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.6.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.6_p20160627.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.6-4.base.tar.xz mirror://gentoo/genpatches-4.6-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.6-4.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=73b57ba729e5db828e2c4fd8afe769d5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.6.4
deleted file mode 100644
index 5c27e2c7c6f2..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.6.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.6.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.6_p20160801.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.6-5.base.tar.xz mirror://gentoo/genpatches-4.6-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.6-5.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f9bf1a74c71258ac33fde3ea2b8ea5ed
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.5 b/metadata/md5-cache/sys-kernel/aufs-sources-4.6.5
deleted file mode 100644
index 7bb8a34d9ead..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.6.5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.6.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.6_p20160801.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.6-6.base.tar.xz mirror://gentoo/genpatches-4.6-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.6-6.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ad026eecf6a5360ea004458128ece27c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.6-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.6.6-r1
deleted file mode 100644
index aedba371a71b..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.6.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.6.6-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.6.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.6_p20160815.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.6-8.base.tar.xz mirror://gentoo/genpatches-4.6-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.6-8.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9f22499c693d996d1e935ccd3797f195
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.7.0 b/metadata/md5-cache/sys-kernel/aufs-sources-4.7.3
similarity index 77%
rename from metadata/md5-cache/sys-kernel/aufs-sources-4.7.0
rename to metadata/md5-cache/sys-kernel/aufs-sources-4.7.3
index e67344a5e75b..1551fe334c43 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.7.0
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.7.3
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.7.0
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.7.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.7_p20160801.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.7-1.base.tar.xz mirror://gentoo/genpatches-4.7-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.7-1.experimental.tar.xz ) )
+SLOT=4.7.3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.7.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.7_p20160905.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.7-4.base.tar.xz mirror://gentoo/genpatches-4.7-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.7-4.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=638a333219f537c6873a36315098eb97
+_md5_=42f9e23ab6926556d8043f9f911db119
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.63 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.63
new file mode 100644
index 000000000000..5c74ba0a2e51
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.63
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.12 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.12.63
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-62.base.tar.xz mirror://gentoo/genpatches-3.12-62.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-62.experimental.tar.xz )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7349cc2eb332b0a33869883c624dd364
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.78 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.78
new file mode 100644
index 000000000000..aef3f22def82
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.78
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.14 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.78
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-85.base.tar.xz mirror://gentoo/genpatches-3.14-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-85.experimental.tar.xz )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=064a51d2b0e8f2dde7c488d64d1c399a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.20 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.20
new file mode 100644
index 000000000000..d5745e640616
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.20
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-22.base.tar.xz mirror://gentoo/genpatches-4.4-22.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-22.experimental.tar.xz )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=04157ec0da28eb8c0b809079e7b476bd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.62 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.63
similarity index 87%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.12.62
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.12.63
index cb9e3874a2a5..fbbff0ea2cd9 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.62
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.63
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.12.62
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.62.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz
+SLOT=3.12.63
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.63.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0dc8fcb8286cc84f96e1568a488616d6
+_md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.77 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.78
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.14.77
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.14.78
index bbf9a2d6a886..dbfe94d31056 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.77
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.78
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.77
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.77.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz
+SLOT=3.14.78
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.78.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.40 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.41
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.18.40
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.18.41
index 7813a1a7d36b..6b1349d1e0c6 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.40
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.41
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.18.40
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.40.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
+SLOT=3.18.41
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.41.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.31 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.32
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.1.31
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.1.32
index 84a0bae19c63..edd67bc33683 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.31
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.32
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.1.31
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.31.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
+SLOT=4.1.32
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.32.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.19 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.20
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.19
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.20
index 6980076ddcaa..bcfde5ade811 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.20
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.19
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.19.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.20
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.20.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.7.2 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.7.3
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.7.2
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.7.3
index a7308494c7e2..0cdfda7351bc 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.7.2
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.7.3
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.7.2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.7.2.xz mirror://kernel/linux/kernel/v4.x/linux-4.7.tar.xz
+SLOT=4.7.3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.7.3.xz mirror://kernel/linux/kernel/v4.x/linux-4.7.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	1b3d95e7eae2df31644c46e06246f14a	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/www-apps/moodle-2.7.15 b/metadata/md5-cache/www-apps/moodle-2.7.16
similarity index 91%
rename from metadata/md5-cache/www-apps/moodle-2.7.15
rename to metadata/md5-cache/www-apps/moodle-2.7.16
index 8f58fcbd3c8b..fdcfa4ed581c 100644
--- a/metadata/md5-cache/www-apps/moodle-2.7.15
+++ b/metadata/md5-cache/www-apps/moodle-2.7.16
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.4.4[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli postgres )
-SLOT=2.7.15
-SRC_URI=http://download.moodle.org/stable27/moodle-2.7.15.tgz
+SLOT=2.7.16
+SRC_URI=http://download.moodle.org/stable27/moodle-2.7.16.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=23702fa69a9db164028b82a71441e34f
diff --git a/metadata/md5-cache/www-apps/moodle-2.9.7 b/metadata/md5-cache/www-apps/moodle-2.9.8
similarity index 92%
rename from metadata/md5-cache/www-apps/moodle-2.9.7
rename to metadata/md5-cache/www-apps/moodle-2.9.8
index 64648f7b3193..77f5fe40313f 100644
--- a/metadata/md5-cache/www-apps/moodle-2.9.7
+++ b/metadata/md5-cache/www-apps/moodle-2.9.8
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.4.4[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli mssql postgres )
-SLOT=2.9.7
-SRC_URI=http://download.moodle.org/stable29/moodle-2.9.7.tgz
+SLOT=2.9.8
+SRC_URI=http://download.moodle.org/stable29/moodle-2.9.8.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=d9c2a2a05e9ac5f4ae98081c0dc0b89c
diff --git a/metadata/md5-cache/www-apps/moodle-3.0.5 b/metadata/md5-cache/www-apps/moodle-3.0.6
similarity index 92%
rename from metadata/md5-cache/www-apps/moodle-3.0.5
rename to metadata/md5-cache/www-apps/moodle-3.0.6
index d353045fcfda..a60adb66724a 100644
--- a/metadata/md5-cache/www-apps/moodle-3.0.5
+++ b/metadata/md5-cache/www-apps/moodle-3.0.6
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.4.4[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli mssql postgres )
-SLOT=3.0.5
-SRC_URI=http://download.moodle.org/stable30/moodle-3.0.5.tgz
+SLOT=3.0.6
+SRC_URI=http://download.moodle.org/stable30/moodle-3.0.6.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=d9c2a2a05e9ac5f4ae98081c0dc0b89c
diff --git a/metadata/md5-cache/www-apps/moodle-3.1.1 b/metadata/md5-cache/www-apps/moodle-3.1.2
similarity index 92%
rename from metadata/md5-cache/www-apps/moodle-3.1.1
rename to metadata/md5-cache/www-apps/moodle-3.1.2
index 2a66742b28e0..12d1d2a31bad 100644
--- a/metadata/md5-cache/www-apps/moodle-3.1.1
+++ b/metadata/md5-cache/www-apps/moodle-3.1.2
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.4.4[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli mssql postgres )
-SLOT=3.1.1
-SRC_URI=http://download.moodle.org/stable31/moodle-3.1.1.tgz
+SLOT=3.1.2
+SRC_URI=http://download.moodle.org/stable31/moodle-3.1.2.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=d9c2a2a05e9ac5f4ae98081c0dc0b89c
diff --git a/metadata/md5-cache/www-client/chromium-54.0.2840.8 b/metadata/md5-cache/www-client/chromium-54.0.2840.16
similarity index 85%
rename from metadata/md5-cache/www-client/chromium-54.0.2840.8
rename to metadata/md5-cache/www-client/chromium-54.0.2840.16
index ad298b86b708..18900f7d86ae 100644
--- a/metadata/md5-cache/www-client/chromium-54.0.2840.8
+++ b/metadata/md5-cache/www-client/chromium-54.0.2840.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-0.9.41:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-0.9.41:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
@@ -7,9 +7,8 @@ IUSE=cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-0.9.41:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-REQUIRED_USE=gn? ( gnome gnome-keyring )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-54.0.2840.8.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-54.0.2840.16.tar.xz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	chromium-2	c30f482b868782938c772c21d9ede135	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8aa1d84c0d1ab4c195f94ec724015018
+_md5_=dfa6fceb9b5fada46c64d6c8388df98e
diff --git a/metadata/md5-cache/www-client/chromium-55.0.2853.0 b/metadata/md5-cache/www-client/chromium-55.0.2853.0
new file mode 100644
index 000000000000..09f7433ccec1
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-55.0.2853.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-0.9.41:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-0.9.41:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-55.0.2853.0.tar.xz
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	chromium-2	c30f482b868782938c772c21d9ede135	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	4c2654a34ebe732e85fda354f6ee642f	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=b238b09205401e4043984f9d02d94887
diff --git a/metadata/md5-cache/www-client/opera-beta-40.0.2308.15 b/metadata/md5-cache/www-client/opera-beta-40.0.2308.44
similarity index 91%
rename from metadata/md5-cache/www-client/opera-beta-40.0.2308.15
rename to metadata/md5-cache/www-client/opera-beta-40.0.2308.44
index 2b68797643c9..a1e99801f1c0 100644
--- a/metadata/md5-cache/www-client/opera-beta-40.0.2308.15
+++ b/metadata/md5-cache/www-client/opera-beta-40.0.2308.44
@@ -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/40.0.2308.15/linux/opera-beta_40.0.2308.15_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-beta/40.0.2308.15/linux/opera-beta_40.0.2308.15_i386.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-beta/40.0.2308.44/linux/opera-beta_40.0.2308.44_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-beta/40.0.2308.44/linux/opera-beta_40.0.2308.44_i386.deb )
 _eclasses_=chromium-2	c30f482b868782938c772c21d9ede135	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c335279c78a67b3fa1dc44e973e4f4a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-370.23 b/metadata/md5-cache/x11-drivers/nvidia-drivers-370.28
similarity index 79%
rename from metadata/md5-cache/x11-drivers/nvidia-drivers-370.23
rename to metadata/md5-cache/x11-drivers/nvidia-drivers-370.28
index 97703b7b240a..ac549839b978 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-370.23
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-370.28
@@ -10,6 +10,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tool
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/370
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/370.23/NVIDIA-FreeBSD-x86_64-370.23.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/370.23/NVIDIA-Linux-x86_64-370.23.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/370.23/NVIDIA-Linux-armv7l-gnueabihf-370.23.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/370.23/NVIDIA-FreeBSD-x86-370.23.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/370.23/NVIDIA-Linux-x86-370.23.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-370.23.tar.bz2 )
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/370.28/NVIDIA-FreeBSD-x86_64-370.28.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/370.28/NVIDIA-Linux-x86_64-370.28.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/370.28/NVIDIA-Linux-armv7l-gnueabihf-370.28.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/370.28/NVIDIA-FreeBSD-x86-370.28.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/370.28/NVIDIA-Linux-x86-370.28.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-370.28.tar.bz2 )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	165fc17c38d1b11dac2008280dab6e80	nvidia-driver	fe3e559a49de32cd7df5ae282f98d107	portability	bb1a0ed8ea152b957d17339f01d4d7f5	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	udev	73058269b3e70e34e084fa3981282338	unpacker	45d07319df5f40ee6af58418b0f930be	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=37437614802c537e13552a40f7bac2ab
+_md5_=c67e1b1701a6640a56afe10935500bf7
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.6 b/metadata/md5-cache/x11-libs/motif-2.3.6
index e66985b8f93f..0840ef3d87cb 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.6
+++ b/metadata/md5-cache/x11-libs/motif-2.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=The Motif user interface component toolkit
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
 IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.6%20Source%20Code/motif-2.3.6.tar.gz http://dev.gentoo.org/~ulm/distfiles/motif-2.3.5-patches-1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=fe9a5efb08bc1053c73ea2292540c638
+_md5_=6b38706f5d51a2296ea7bf65334e6401
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.2 b/metadata/md5-cache/x11-libs/pango-1.40.2
new file mode 100644
index 000000000000..08c13708a604
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/pango-1.40.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( media-fonts/cantarell ) X? ( >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-devel/autoconf-2.63:2.5 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Internationalized text layout and rendering library
+EAPI=6
+HOMEPAGE=http://www.pango.org/
+IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ FTL
+RDEPEND=>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://gnome/sources/pango/1.40/pango-1.40.2.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=36aaa65e5e7a0eecc51fa347c6a7fbb8
diff --git a/metadata/md5-cache/x11-misc/py3status-3.0 b/metadata/md5-cache/x11-misc/py3status-3.1
similarity index 96%
rename from metadata/md5-cache/x11-misc/py3status-3.0
rename to metadata/md5-cache/x11-misc/py3status-3.1
index 1b024c10ba07..4e300f1c3c57 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.0
+++ b/metadata/md5-cache/x11-misc/py3status-3.1
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=x11-misc/i3status python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/3.0.tar.gz -> py3status-3.0.tar.gz
+SRC_URI=https://github.com/ultrabug/py3status/archive/3.1.tar.gz -> py3status-3.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c942d66f5d58097138570d9690653813
diff --git a/metadata/md5-cache/x11-misc/qt5ct-0.26 b/metadata/md5-cache/x11-misc/qt5ct-0.26
new file mode 100644
index 000000000000..fe1411f191d6
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qt5ct-0.26
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
+DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=mirror://sourceforge/qt5ct/qt5ct-0.26.tar.bz2
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=537e5ad8e109ae594fe65f85cb6c6897
diff --git a/metadata/md5-cache/x11-misc/slock-1.2 b/metadata/md5-cache/x11-misc/slock-1.2
deleted file mode 100644
index fab2d85fc2d0..000000000000
--- a/metadata/md5-cache/x11-misc/slock-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto filecaps? ( sys-libs/libcap )
-DESCRIPTION=simple X screen locker
-EAPI=5
-HOMEPAGE=http://tools.suckless.org/slock
-IUSE=+filecaps savedconfig
-KEYWORDS=amd64 hppa x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://dl.suckless.org/tools/slock-1.2.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=683d2352365f3917e2d0e5a2c7febc08
diff --git a/metadata/md5-cache/x11-misc/slock-1.3-r2 b/metadata/md5-cache/x11-misc/slock-1.3-r2
deleted file mode 100644
index efc7069c030e..000000000000
--- a/metadata/md5-cache/x11-misc/slock-1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-proto/randrproto x11-proto/xproto filecaps? ( sys-libs/libcap )
-DESCRIPTION=simple X screen locker
-EAPI=5
-HOMEPAGE=http://tools.suckless.org/slock
-IUSE=+filecaps savedconfig
-KEYWORDS=~amd64 hppa ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr
-SLOT=0
-SRC_URI=http://dl.suckless.org/tools/slock-1.3.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=1491995651b394dc941e35ef2fbc74ef
diff --git a/metadata/md5-cache/x11-misc/slock-1.3-r3 b/metadata/md5-cache/x11-misc/slock-1.3-r3
index 618790a59187..105502b0a79d 100644
--- a/metadata/md5-cache/x11-misc/slock-1.3-r3
+++ b/metadata/md5-cache/x11-misc/slock-1.3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=simple X screen locker
 EAPI=6
 HOMEPAGE=http://tools.suckless.org/slock
 IUSE=+filecaps savedconfig
-KEYWORDS=~amd64 hppa ~x86 ~x86-fbsd
+KEYWORDS=amd64 hppa x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://dl.suckless.org/tools/slock-1.3.tar.gz
 _eclasses_=fcaps	6a1091a98b1dde01cc26ab3252da1a9b	multilib	165fc17c38d1b11dac2008280dab6e80	portability	bb1a0ed8ea152b957d17339f01d4d7f5	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=bec49f614b6be27e8fce1b6969d43b8e
+_md5_=76803bbe70d6d38998fabc772f8a9272
diff --git a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r161 b/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r161
deleted file mode 100644
index 86304b54827b..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r161
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.16:3 !>=x11-libs/gtk+-3.17:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/autoconf-2.53:* >=x11-misc/icon-naming-utils-0.8.7:0 virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of MATE themes, with sets for users with limited or low vision
-EAPI=5
-HOMEPAGE=http://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.16:3 !>=x11-libs/gtk+-3.17:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
-RESTRICT=binchecks strip
-SLOT=0/3.16
-SRC_URI=http://pub.mate-desktop.org/releases/1.10/mate-themes-gtk3.16-1.10.5.tar.xz -> mate-themes-1.10.5-gtk3.16.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c0f77714b992235d7ab87fad56a405b4
diff --git a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r181 b/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r181
deleted file mode 100644
index 20d210eb4d41..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r181
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.18:3 !>=x11-libs/gtk+-3.19:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/autoconf-2.53:* >=x11-misc/icon-naming-utils-0.8.7:0 virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A set of MATE themes, with sets for users with limited or low vision
-EAPI=5
-HOMEPAGE=http://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.18:3 !>=x11-libs/gtk+-3.19:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
-RESTRICT=binchecks strip
-SLOT=0/3.18
-SRC_URI=http://pub.mate-desktop.org/releases/1.10/mate-themes-gtk3.18-1.10.5.tar.xz -> mate-themes-1.10.5-gtk3.18.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c0f77714b992235d7ab87fad56a405b4
diff --git a/metadata/md5-cache/x11-themes/mate-themes-meta-1.10 b/metadata/md5-cache/x11-themes/mate-themes-meta-1.10
deleted file mode 100644
index a87b81dfaf0c..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-meta-1.10
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package to facilitate easy use of x11-themes/mate-themes
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-RDEPEND=|| ( ( =x11-libs/gtk+-3.16*:3 =x11-themes/mate-themes-1.10*:0/3.16 ) ( =x11-libs/gtk+-3.18*:3 =x11-themes/mate-themes-1.10*:0/3.18 ) =x11-themes/mate-themes-1.10*:0 )
-SLOT=0
-_md5_=ff0fbc72a2d6dc6cbdde9933615020f3
diff --git a/metadata/md5-cache/x11-themes/mate-themes-meta-3 b/metadata/md5-cache/x11-themes/mate-themes-meta-3
deleted file mode 100644
index 5a1fa4af5b24..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-meta-3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package to facilitate easy use of x11-themes/mate-themes
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=gtk2-only
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-RDEPEND=|| ( gtk2-only? ( !!11-libs/gtk+:3 x11-themes/mate-themes:0 ) ( =x11-libs/gtk+-3.16*:3 =x11-themes/mate-themes-3.16*:0/3.16 ) ( =x11-libs/gtk+-3.18*:3 =x11-themes/mate-themes-3.18*:0/3.18 ) ( =x11-libs/gtk+-3.20*:3 =x11-themes/mate-themes-3.20*:0/3.20 ) )
-SLOT=0
-_md5_=7261fa6e1ea9c9bb59671118ef1c7a80
diff --git a/metadata/md5-cache/x11-themes/mate-themes-meta-3-r1 b/metadata/md5-cache/x11-themes/mate-themes-meta-3-r1
new file mode 100644
index 000000000000..26ab5b381e34
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/mate-themes-meta-3-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package to facilitate easy use of x11-themes/mate-themes
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=gtk2-only
+KEYWORDS=amd64 ~arm x86
+LICENSE=metapackage
+RDEPEND=|| ( gtk2-only? ( !!x11-libs/gtk+:3 x11-themes/mate-themes:0 ) ( =x11-libs/gtk+-3.16*:3 =x11-themes/mate-themes-3.16*:0/3.16 ) ( =x11-libs/gtk+-3.18*:3 =x11-themes/mate-themes-3.18*:0/3.18 ) ( =x11-libs/gtk+-3.20*:3 =x11-themes/mate-themes-3.20*:0/3.20 ) )
+SLOT=0
+_md5_=d7b949ce5849e46d89e8a3cd421bf5b5
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1 b/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1
index 4fed718284e5..831f6b0a58d8 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.8.18-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=gtk? ( X ) windeco? ( kde X ) || ( gtk qt4 qt5 )
 SLOT=0
 SRC_URI=https://github.com/QtCurve/qtcurve/archive/1.8.18.tar.gz -> qtcurve-1.8.18.tar.gz https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> qtcurve-1.8.18-dont_use_c++11.patch
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	96b90a3b01cc31c8028febaaf1a968af	kde4-functions	8a4cfd7f1a927a64f5dbcc8f3277ec51	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=05eeed6703e7a6160cf02092e4b75adc
+_md5_=c2fc2605b4153b62bbbf344e29e124dc
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.3.2 b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.3.2
new file mode 100644
index 000000000000..2e75fda7b4e4
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-notifyd-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.10:= dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Notification daemon for the Xfce desktop environment
+EAPI=5
+HOMEPAGE=http://goodies.xfce.org/projects/applications/xfce4-notifyd
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=mirror://xfce/src/apps/xfce4-notifyd/0.3/xfce4-notifyd-0.3.2.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48	xfconf	d842ab8b2140980394561496bf157447
+_md5_=232c7fe7e190b85d22654024ebc01c54
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0270daa81485..baeb956a7f6e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 12:10:38 +0000
+Sun, 11 Sep 2016 17:10:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 98c6105aeef8..ed8a1e4dbf98 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Sep  9 12:09:43 UTC 2016
+Sun Sep 11 17:09:43 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fc25c4b03e2b..66be14871dbc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 12:30:01 +0000
+Sun, 11 Sep 2016 17:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d7e6edb98ac8..67977384ea22 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1473423001 Fri 09 Sep 2016 12:10:01 PM UTC
+1473613801 Sun 11 Sep 2016 05:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0270daa81485..baeb956a7f6e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2016 12:10:38 +0000
+Sun, 11 Sep 2016 17:10:38 +0000
diff --git a/net-analyzer/wireshark/wireshark-2.0.6.ebuild b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
index eed093c284d0..c5f1ed4735ca 100644
--- a/net-analyzer/wireshark/wireshark-2.0.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
 	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index bba25e2c80f1..8bcc74c0ece3 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1 +1,2 @@
 DIST ejabberd-16.04.tar.gz 1715963 SHA256 3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 WHIRLPOOL d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
+DIST ejabberd-16.08.tar.gz 1739542 SHA256 b45598a6f2f1b398a19f23e3280b45eccc833d3339b1aeb6ec08ded7c19b1137 SHA512 661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55 WHIRLPOOL 41f5ae825997818671d6db94ac62108a0b02f8eb6eed07ebaa04287ee2d7955dc4d15c3ce18cbf20240e4b2a14d48ccb8bf383b510851be12326131c4c829788
diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild b/net-im/ejabberd/ejabberd-16.08.ebuild
new file mode 100644
index 000000000000..125bd012a41c
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-16.08.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+	riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO: 	>=dev-erlang/meck-0.8.4
+# TODO: 	>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+	>=dev-erlang/cache_tab-1.0.3
+	>=dev-erlang/esip-1.0.7
+	>=dev-erlang/fast_tls-1.0.6
+	>=dev-erlang/fast_xml-1.1.14
+	>=dev-erlang/fast_yaml-1.0.5
+	>=dev-erlang/jiffy-0.14.7
+	>=dev-erlang/lager-3.2.1
+	>=dev-erlang/luerl-0.2
+	>=dev-erlang/p1_oauth2-0.6.1
+	>=dev-erlang/p1_utils-1.0.5
+	>=dev-erlang/p1_xmlrpc-1.15.1
+	>=dev-erlang/stringprep-1.0.5
+	>=dev-erlang/stun-1.0.6
+	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
+	nls? ( >=dev-erlang/iconv-1.0.1 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	riak? (
+		>=dev-erlang/hamcrest-0.1.0_p20150103
+		>=dev-erlang/riakc-2.1.1_p20151111
+	)
+	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+	zlib? ( >=dev-erlang/ezlib-1.0.1 )"
+DEPEND="${CDEPEND}
+	>=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+	sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+		-e "s|\"pamservicename\"|\"xmpp\"|" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Check if there already exists a certificate.
+ejabberd_cert_exists() {
+	local cert
+
+	for cert in $(gawk -- \
+			'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \
+			"${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
+		[[ -f ${cert} ]] && return 0
+	done
+
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!' \
+		-e 's!(User|Group)=(.*)!\1=jabber!' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable nls iconv) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable riak) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable zlib)
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+		# PAM helper module permissions
+		# https://www.process-one.net/docs/ejabberd/guide_en.html#pam
+		fowners root:jabber "${epam_path}"
+		fperms 4750 "${epam_path}"
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  http://www.process-one.net/en/ejabberd/docs/"
+		echo
+		if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
+			ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after"
+			ewarn "migration to ${PV}. pubsub data may not be migrated automatically and"
+			ewarn "you may need to run migration script manually, see:"
+			ewarn
+			ewarn "  https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"
+			ewarn
+			ewarn "In case you don't care about all stored moods, activities, geoinfo and you"
+			ewarn "know you don't store in pubsub anything important, you can just remove"
+			ewarn "pubsub tables:"
+			ewarn
+			ewarn "  rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
+			ewarn
+			ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"
+			echo
+		fi
+	elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
+		elog "Ejabberd now defaults to using a YAML format for its config file."
+		elog "The old ejabberd.cfg file can be converted using the following instructions:"
+		echo
+		elog "1. Make sure all processes related to the previous version of ejabberd aren't"
+		elog "   running. Usually this just means the ejabberd and epmd daemons and possibly"
+		elog "   the pam-related process (epam) if pam support is enabled."
+		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can"
+		elog "   fail to start ejabberd properly for various reasons. Check ejabberd's main"
+		elog "   log file at /var/log/jabber/ejabberd.log to confirm it started successfully."
+		elog "3. Run"
+		elog "     \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config"
+		elog "   file."
+		echo
+	fi
+
+	if ! ejabberd_cert_exists; then
+		ejabberd_cert_install
+	fi
+
+	if use pam; then
+		# sfperms drops read bit from files with suid. Reapply it.
+		# Fix bug #592218.
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+		chmod g+r "${EROOT%/}${epam_path}" \
+			|| die "failed to correct ${epam_path} permissions"
+	fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch
new file mode 100644
index 000000000000..6001c651f5d6
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-16.08-ejabberdctl.patch
@@ -0,0 +1,62 @@
+From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 29 Aug 2016 22:29:41 +0100
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
+
+Set SHELL since the generic jabber user used on Gentoo for jabber
+servers doesn't have a valid shell set by default and fix EXEC_CMD
+otherwise it fails with "This account is currently not available" again
+due to jabber not having a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when
+instead it defaults to /dev/null on Gentoo.
+---
+ ejabberdctl.template | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 5b34ebe..3c080fd 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
+ EPMD={{epmd}}
+ INSTALLUSER={{installuser}}
+ ERL_LIBS={{libdir}}
++SHELL=/bin/sh
+ 
+ # check the proper system user is used if defined
+ if [ "$INSTALLUSER" != "" ] ; then
+@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+-            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su $INSTALLUSER -p -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define mnesia options
+ MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
+@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
++export SHELL
+ 
+ shell_escape_str()
+ {
+-- 
+2.9.2
+
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 0a7499bffb0a..2784dc456611 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1 +1,2 @@
 DIST skype-4.3.0.37.tar.bz2 19310701 SHA256 8c99dc3978a588fb13303df7c8134379fb55b8dd460efefbc79ae594269b892d SHA512 935d0c06c031a90414f9b20c9a782c59deee36abff781c08f1dfd62194763dc9674bb85d478ae916b1bf440b123291d64380bc28295e9ecdd6522d17b434b7a5 WHIRLPOOL 1e5a84b04d7eb9bbf3bae9ae6e69bb41587a1cef7f5ff19af0363343fd7fc949d5202959efaf93b0ed9ccb939b8b2ad4d61fc9626fffbdc2a8d898f9fa29b300
+DIST skypeforlinux_1.7.0.1-1.x86_64.rpm 58391020 SHA256 db74489b0e96f5a590ab20567ec69178e9bed1c4d89963569f751814096da66b SHA512 7bbb9c13213aac000d39cc27856ddbae173a9bad373c2051a72872f7e33b938cc9d9f673e2f0f9e734b2e396b4717ea5b5d65d18afa2f080c21291d1585f6044 WHIRLPOOL f33bd8e016f0da37d6eea8d530b55b979677fbf794d331246a75385b27c6bdcf0769ed8beda0a22313bb55b6eac30948a480f0aa8b12d98d73567a9f4e9a94d2
diff --git a/net-im/skype/skype-1.7.0.1.ebuild b/net-im/skype/skype-1.7.0.1.ebuild
new file mode 100644
index 000000000000..a650d3c0f59e
--- /dev/null
+++ b/net-im/skype/skype-1.7.0.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#inherit eutils rpm pax-utils
+inherit eutils rpm
+
+DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/skypeforlinux_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS no-source-code"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+#IUSE="pax_kernel selinux"
+IUSE=""
+
+S="${WORKDIR}"
+QA_PREBUILT=opt/skypeforlinux/skypeforlinux
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	!${CATEGORY}/${PN}:0
+	virtual/ttf-fonts
+	gnome-base/libgnome-keyring
+	gnome-base/gnome-keyring
+	gnome-base/gconf"
+#	selinux? ( sec-policy/selinux-skype )"
+
+src_unpack () {
+	rpm_src_unpack ${A}
+}
+
+src_prepare() {
+	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EROOT}opt/skypeforlinux/skypeforlinux!" \
+		-i usr/bin/skypeforlinux
+	sed -e "s!^Exec=.*!Exec=${EROOT}opt/bin/skypeforlinux!" \
+		-e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+		-i usr/share/applications/skypeforlinux.desktop
+}
+
+src_install() {
+
+	insinto /opt/skypeforlinux/locales
+	doins usr/share/skypeforlinux/locales/*.pak
+
+	insinto /opt/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release
+	doins usr/share/skypeforlinux/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node
+
+	insinto /opt/skypeforlinux/resources
+	doins usr/share/skypeforlinux/resources/*.asar
+
+	insinto /opt/skypeforlinux
+	doins usr/share/skypeforlinux/*.pak
+	doins usr/share/skypeforlinux/*.bin
+	doins usr/share/skypeforlinux/*.dat
+	doins usr/share/skypeforlinux/version
+	exeinto /opt/skypeforlinux
+	doexe usr/share/skypeforlinux/*.so
+	doexe usr/share/skypeforlinux/skypeforlinux
+
+	into /opt
+	dobin usr/bin/skypeforlinux
+	fowners root:audio /opt/bin/skypeforlinux /opt/skypeforlinux/skypeforlinux
+
+#	insinto /etc/dbus-1/system.d
+#	doins ${PN}.conf
+
+	dodoc usr/share/doc/skypeforlinux/* usr/share/skypeforlinux/*.html
+	dodoc usr/share/skypeforlinux/*.txt usr/share/skypeforlinux/LICENSE
+
+	# create compat symlink
+	dosym ${P} /usr/share/doc/skypeforlinux
+
+	doicon usr/share/pixmaps/skypeforlinux.png
+
+	local res
+	for res in 16 32 256 512; do
+		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+	done
+
+	domenu usr/share/applications/skypeforlinux.desktop
+
+#	if use pax_kernel; then
+#		if use apulse; then
+#			pax-mark Cm "${ED}"/opt/bin/${PN}-bin || die
+#		else
+#			pax-mark Cm "${ED}"/opt/bin/${PN} || die
+#		fi
+#		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+#		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+#		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+#		eqawarn "you suspect that ${PN} is being broken by this modification,"
+#		eqawarn "please open a bug."
+#	fi
+
+#	echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN}
+#	doenvd "${T}"/99${PN} #430142
+}
+
+pkg_postinst() {
+	einfo "See https://support.skype.com/en/faq/FA34656"
+	einfo "for more information about Skype for Linux Alpha."
+}
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index 7828d8e7e773..c3606ce81c08 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1 +1,2 @@
 DIST telepathy-mission-control-5.16.3.tar.gz 1096019 SHA256 71575d2ff8aa7337aca355e3d921eba5cd2ff050fabc01e51577343093e98b7d SHA512 4cf8b387e74aa11536dfcc607a2bef4b1b594fb027753fc8bb702c27251ccbb611b80724f4f5b95c6cd347c53df4f0474fcc0dd4ee42313f8b655c2a745231ad WHIRLPOOL 4a905ee2b8bc92803735cdd837bd921e01236136433314e64b0c14689d7784d69495673a587134f650932769aafaabc6990f52f4a2c9ccc35427c02511bc1b8e
+DIST telepathy-mission-control-5.16.4.tar.gz 1102177 SHA256 9769ddac7ad8aad21f6db854016792162b57e6fa0b0aed8d823d76a71fe7e6cb SHA512 5ed624df2d041554af074c22a18db2405fa5bd41bec40edc574382eb9d8b9f93ff6f4be3042d27f950694a353f4192670e200f5f8865419701ca520a973959ed WHIRLPOOL 7672345d3ac76c879c22c2a5cb0180a5fe4bc03403f1e5d934a3b3944ec75eb6c0c6f17610f9619acc6a35892d16dd2c642fc85d2dbf3659f058da9c49aa717e
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild
new file mode 100644
index 000000000000..09546c37922f
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+# Needed for tests and build #489466
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
+HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="debug networkmanager" # test
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.82
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-0.95
+	>=net-libs/telepathy-glib-0.20
+	networkmanager? ( >=net-misc/networkmanager-1:= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	virtual/pkgconfig
+"
+#	test? ( dev-python/twisted-words )"
+
+# Tests are broken, see upstream bug #29334 and #64212
+# upstream doesn't want it enabled everywhere (#29334#c12)
+RESTRICT="test"
+
+src_configure() {
+	# creds is not available
+	gnome2_src_configure \
+		--disable-static \
+		--disable-upower \
+		$(use_enable debug) \
+		$(use_with networkmanager connectivity nm)
+}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 89dbdc1ab84c..6899878dbe9e 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,2 +1,3 @@
 DIST Unreal3.2.10.4.tar.gz 3540227 SHA256 5041b67745d0bd2072cf9b74c07853085b8b5b07330263f0986bdc56eda98aa8 SHA512 eeecefe79cadf3efa1b9379d4b675c0b86a2dd91e703f9e4b3998331f56b923d3719c67482f464f9b1699f801e0a83d677ada642ea7037c52a9d5db63abe6a5c WHIRLPOOL e52949bb6b20076d382825a841c8f643f1f64ac265d7f58898a6417c4853b569b8f561d5dccf198b4f006725e4be0636a2edb580023e8db62dadab8397d11975
-DIST unrealircd-4.0.5.tar.gz 4877444 SHA256 5b69bbeb3487e98df2f6506d0455ce62f069281c88b937caf4e32f4f92a42717 SHA512 503c55b901531bb984c6cfbeaaf560da714248ff716717671e09442f5a9fa245cd872ae69d08533419fb94efab98e9f80ae4f33c62522c246da6e877971b2a38 WHIRLPOOL 1fc4e16e4c12035758c673b88effd660766ab2bff56999ebaced6be1acb0b4a6c69efd3cd90ffaa63ee6479adda6e16cc415640322a4a66346e5bb182b795178
+DIST Unreal3.2.10.7.tar.gz 3539026 SHA256 472e12cd42d2e725a1795e2bead4786062775782bd015a07697c2edf400d4047 SHA512 7d5fd4729fdde56c6b3e38a93bc365857b5b4faf58cb39e844b43e87872623abc7527025247eeda8c8535576e2b1b8ef14d482c964ce940cafb5de77cc9e1667 WHIRLPOOL 48c578ba12a36ab8078b5569d5de05134699218a6265591aa9ce80614015d96c76624eda17c42b7301379ebbd48e1ea1a62360b624e1d482cbdae562905a95a2
+DIST unrealircd-4.0.6.tar.gz 4877399 SHA256 0193754212e01eba96aed7c2fb2f1d022408f424d251e8b0db870e714c752f09 SHA512 3cf70334966b87902e4a94e391545549df96885ebec26f7d2ec3f2620e18c829c3f7f566b4c1a22c8bcf16d19fdcb35ed10e37d4ce981fe2decd3b90ff204486 WHIRLPOOL f415f846da32de33cc19e16c66af465e058b29184dfdb4624bc78b06e901bc4d5a98a15761fd2dc773715e39c272435de4bc24007db1c06291b15f0edff2d7ba
diff --git a/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild b/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild
new file mode 100644
index 000000000000..a9173c92b9a7
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils ssl-cert versionator multilib user
+
+MY_P=Unreal${PV/_/-}
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="http://www.unrealircd.com/"
+SRC_URI="http://www.unrealircd.com/downloads/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="class-nofakelag curl ipv6 +extban-stacking +operoverride operoverride-verify +prefixaq
+	showlistmodes shunnotices ssl topicisnuhost +usermod zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )
+	curl? ( net-misc/curl[adns] )
+	dev-libs/tre
+	>=net-dns/c-ares-1.7"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/pkgconfig"
+
+S=${WORKDIR}/Unreal${PV}
+
+pkg_setup() {
+	enewuser unrealircd
+}
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm extras/*.gz || die
+
+	sed -i \
+		-e "s:ircd\.pid:${EPREFIX}/var/run/unrealircd/ircd.pid:" \
+		-e "s:ircd\.log:${EPREFIX}/var/log/unrealircd/ircd.log:" \
+		-e "s:debug\.log:${EPREFIX}/var/log/unrealircd/debug.log:" \
+		-e "s:ircd\.tune:${EPREFIX}/var/lib/unrealircd/ircd.tune:" \
+		include/config.h \
+		|| die "sed failed"
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-listen=5 \
+		--with-dpath="${EPREFIX}"/etc/unrealircd \
+		--with-spath="${EPREFIX}"/usr/bin/unrealircd \
+		--with-nick-history=2000 \
+		--with-sendq=3000000 \
+		--with-bufferpool=18 \
+		--with-permissions=0600 \
+		--with-fd-setsize=1024 \
+		--with-system-cares \
+		--with-system-tre \
+		--enable-dynamic-linking \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable prefixaq) \
+		$(use_enable ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable zlib ziplinks "${EPREFIX}"/usr) \
+		$(use_with showlistmodes) \
+		$(use_with topicisnuhost) \
+		$(use_with shunnotices) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_with !usermod disableusermod) \
+		$(use_with !extban-stacking disable-extendedban-stacking)
+}
+
+src_install() {
+	keepdir /var/{lib,log}/unrealircd
+
+	newbin src/ircd unrealircd
+
+	exeinto /usr/$(get_libdir)/unrealircd/modules
+	doexe src/modules/*.so
+
+	dodir /etc/unrealircd
+	dosym /var/lib/unrealircd /etc/unrealircd/tmp
+
+	insinto /etc/unrealircd
+	doins {badwords.*,help,spamfilter,dccallow}.conf
+	newins doc/example.conf unrealircd.conf
+
+	insinto /etc/unrealircd/aliases
+	doins aliases/*.conf
+
+	local so_suffix=so
+	[[ ${CHOST} == -*mingw* ]] && so_suffix=dll
+	sed -i \
+		-e s:src/modules:"${EPREFIX}"/usr/$(get_libdir)/unrealircd/modules: \
+		-e '/loadmodule.*\.'${so_suffix}'/s;^//;;' \
+		-e s:ircd\\.log:"${EPREFIX}"/var/log/unrealircd/ircd.log: \
+		"${ED}"/etc/unrealircd/unrealircd.conf \
+		|| die
+
+	dodoc \
+		Changes Donation Unreal.nfo \
+		ircdcron/{ircd.cron,ircdchk} \
+		|| die "dodoc failed"
+	dohtml doc/*.html
+
+	newinitd "${FILESDIR}"/unrealircd.initd unrealircd
+	newconfd "${FILESDIR}"/unrealircd.confd-r1 unrealircd
+
+	# config should be read-only
+	fperms -R 0640 /etc/unrealircd{,/aliases}
+	fperms 0750 /etc/unrealircd{,/aliases}
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/{lib,log}/unrealircd
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/unrealircd
+}
+
+pkg_preinst() {
+	# Must pre-create directories; otherwise their permissions are lost
+	# on installation.
+
+	# Usage: _unrealircd_dir_permissions <user> <group> <mode> <dir>[, <dir>…]
+	#
+	# Ensure that directories are created with the correct permissions
+	# before portage tries to merge them to the filesystem because,
+	# otherwise, those directories are installed world-readable.
+	#
+	# If this is a first-time install, create those directories with
+	# correct permissions before installing. Otherwise, update
+	# permissions—but only if we are replacing an unrealircd ebuild at
+	# least as old as net-irc/unrealircd-3.2.10. Portage handles normal
+	# file permissions correctly, so no need for recursive
+	# chmoding/chowning.
+	_unrealircd_dir_permissions() {
+		local user=${1} group=${2} mode=${3} dir v
+		shift 3
+		while dir=${1} && shift; do
+			if [[ ! -d "${EROOT}${dir}" ]]; then
+				ebegin "Creating ${EROOT}${dir} with correct permissions"
+				install -d -m "${mode}" -o "${user}" -g "${group}" "${EROOT}${dir}" || die
+				eend ${?}
+			elif ! [[ ${REPLACING_VERSIONS} ]] || for v in ${REPLACING_VERSIONS}; do
+					# If 3.2.10 ≤ ${REPLACING_VERSIONS}, then we update
+					# existing permissions.
+					version_is_at_least "${v}" 3.2.10 && break
+				done; then
+				ebegin "Correcting permissions of ${EROOT}${dir} left by ${CATEGORY}/${PN}-${v}"
+				chmod "${mode}" "${EROOT}${dir}" \
+					&& chown ${user}:${group} "${EROOT}${dir}" \
+					|| die "Unable to correct permissions of ${EROOT}${dir}"
+				eend ${?}
+			fi
+		done
+	}
+
+	# unrealircd only needs to be able to read files in /etc/unrealircd.
+	_unrealircd_dir_permissions root unrealircd 0750 etc/unrealircd{,/aliases}
+
+	# unrealircd needs to be able to create files in /var/lib/unrealircd
+	# and /var/log/unrealircd.
+	_unrealircd_dir_permissions root unrealircd 0770 var/{lib,log}/unrealircd
+}
+
+pkg_postinst() {
+	# Move docert call from scr_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if use ssl ; then
+		if [[ ! -f "${EROOT}"/etc/unrealircd/server.cert.key ]]; then
+			install_cert /etc/unrealircd/server.cert
+			chown unrealircd "${EROOT}"/etc/unrealircd/server.cert.*
+			chmod 0640 "${EROOT}"/etc/unrealircd/server.cert.*
+			ln -snf server.cert.key "${EROOT}"/etc/unrealircd/server.key.pem
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/unrealircd/unrealircd.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(unrealircd -k 2>&1 | tail -n 3)
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can find example cron scripts here:"
+	elog "   /usr/share/doc/${PF}/ircd.cron.gz"
+	elog "   /usr/share/doc/${PF}/ircdchk.gz"
+	elog
+	elog "You can also use /etc/init.d/unrealircd to start at boot"
+}
diff --git a/net-irc/unrealircd/unrealircd-4.0.5.ebuild b/net-irc/unrealircd/unrealircd-4.0.6.ebuild
similarity index 90%
rename from net-irc/unrealircd/unrealircd-4.0.5.ebuild
rename to net-irc/unrealircd/unrealircd-4.0.6.ebuild
index b05a9840475b..1740fedf9f75 100644
--- a/net-irc/unrealircd/unrealircd-4.0.5.ebuild
+++ b/net-irc/unrealircd/unrealircd-4.0.6.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+SSL_CERT_MANDATORY=1
 inherit eutils ssl-cert versionator multilib user
 
 DESCRIPTION="An advanced Internet Relay Chat daemon"
@@ -14,9 +15,9 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
-	showlistmodes shunnotices ssl topicisnuhost +usermod"
+	showlistmodes shunnotices topicisnuhost +usermod"
 
-RDEPEND="ssl? ( dev-libs/openssl:= )
+RDEPEND="dev-libs/openssl:=
 	curl? ( net-misc/curl[adns] )
 	dev-libs/libpcre2
 	dev-libs/tre
@@ -69,9 +70,9 @@ src_configure() {
 		--with-system-pcre2 \
 		--with-system-tre \
 		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
 		$(use_enable curl libcurl "${EPREFIX}"/usr) \
 		$(use_enable prefixaq) \
-		$(use_enable ssl ssl "${EPREFIX}"/usr) \
 		$(use_with showlistmodes) \
 		$(use_with topicisnuhost) \
 		$(use_with shunnotices) \
@@ -104,7 +105,7 @@ src_install() {
 	doins -r doc/conf/{aliases,help}
 	doins doc/conf/*.conf
 	newins doc/conf/examples/example.conf ${PN}.conf
-	use ssl && keepdir /etc/${PN}/ssl
+	keepdir /etc/${PN}/ssl
 
 	dodoc \
 		doc/{Changes.old,Changes.older,RELEASE-NOTES} \
@@ -116,7 +117,7 @@ src_install() {
 	# config should be read-only
 	fperms -R 0640 /etc/${PN}
 	fperms 0750 /etc/${PN}{,/aliases,/help}
-	use ssl && fperms 0750 /etc/${PN}/ssl
+	fperms 0750 /etc/${PN}/ssl
 	# state is editable but not owned by unrealircd directly
 	fperms 0770 /var/log/${PN}
 	fperms 0770 /var/lib/${PN}{,/tmp}
@@ -172,20 +173,18 @@ pkg_preinst() {
 pkg_postinst() {
 	# Move docert call from src_install() to install_cert in pkg_postinst for
 	# bug #201682
-	if use ssl ; then
-		if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
-			if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
-				ewarn "The location ${PN} looks for SSL certificates has changed"
-				ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
-				ewarn "Please move your existing certificates."
-			else
-				(
-					umask 0037
-					install_cert /etc/${PN}/ssl/server.cert
-					chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
-					ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
-				)
-			fi
+	if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
+		if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/ssl/server.cert
+				chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
+				ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
+			)
 		fi
 	fi
 
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 90ed25dc908f..6111a68e8f02 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-online-accounts-3.18.4.tar.xz 1384756 SHA256 9f23460aa6b1d8a63a8f3e979cba791cc88b5e07116f07da59fdcea09d79c74d SHA512 1d78d8720d3547e782a9c9b1fee5ec794c8a0ec56d94f690adc1cce9d4f20da07b85a7c6e657b591153db667b3580d8900217e789144ac2e40eb963a7ac8d1a8 WHIRLPOOL 5459b9670c555a331c1c89583abd81836b8da2369355a97784fa370473341c49d5543d88870c49a8f47afd72a11feb27e3bfdb081b10fce8eb1a057eab279d02
+DIST gnome-online-accounts-3.18.6.tar.xz 1478544 SHA256 7e7c581b19b213d04c56a080ed7240a90999d7be2daca27d4aa054d205b48fa5 SHA512 1261596888c0704be8707d58aad381bb715d14a5f1ffd3c2db37b34289343f43feadacf1728dfe57b0ef1a1897dbd3471817f565bf0187b8bc042dd81d40b849 WHIRLPOOL 3c31fff5394f8ad65f8fcc230b8dde658ca64b36e48e744281df28f9f1e4ce470d3a2256f0b92a6c99616abcd82bbf5d96f4cb23d03afe84a58829c617bcf67d
 DIST gnome-online-accounts-3.20.2.tar.xz 1483312 SHA256 4b555d9d2587d49148929e836ff02d5dda80c4138f69036fa214b71383cdc1dd SHA512 102e81f75792f87642e4f3c08e8367a6d333a16e71a28aec000f02f7e9c7ca687435846b20902a281fb4eec576e4b9ec19ac076832fe746666627ff306d1d91a WHIRLPOOL 60bd5eee541df19559d520c0247b583fca2457d5a02e6a7b21ebe81a6e886914f7e36175eca162ff8e76111ead39fc044616676508d18c93fa604934b88b8d87
 DIST gnome-online-accounts-3.20.3.tar.xz 1485044 SHA256 094fc04cf3e0b4ace667fce3b5bdcca5093e0c93f9184439e663c69546c1e046 SHA512 2980c60b67d9dc7900e027946c957e14e8b2fb4785a6a7f51e5e48e36655fba51cdd1d56f750d473116b960ffaebd658e9d974047a6f627dd962d492174f8d67 WHIRLPOOL 8cd15e7914347845859d9e3f20e9a2a54581b38eb3903288a42dd379d3bb9fcc366d472fdab27e16112ded884cd59e67f739233184ffa9df787b313f074d5343
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.6.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.6.ebuild
new file mode 100644
index 000000000000..431dd68a61ae
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	net-libs/telepathy-glib
+	>=net-libs/webkit-gtk-2.7.2:4
+	>=x11-libs/gtk+-3.11.1:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=
+		app-crypt/mit-krb5 )
+"
+#	telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.3
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	# telepathy optional support is really a badly done, bug #494456
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-telepathy \
+		--enable-windows-live \
+		$(use_enable kerberos)
+		#$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
index 7ed4505e32a4..ef19254b5a15 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,2 +1,2 @@
-DIST libdmapsharing-2.9.32.tar.gz 742229 SHA256 74b9ca2a3f04708ef5e6a87922cb42bad677b6f27fd0bc8ad53067ef6bbf0518 SHA512 fd152749055dd02fefa672f7da3efc85bffa7ddb10880886dff829fc8abfaecc79131366fdf31f5657c1b5e622c04f3dbfc750998ea56ffaf9af800210b17084 WHIRLPOOL f8fb493eb9181a18ef1d2dacd44920f8312db344df7aa1f842764ef95591d03fd511fab4e3c1c2e4966caa8738db9227031a458a892cec16c2158381701b8484
 DIST libdmapsharing-2.9.35.tar.gz 759676 SHA256 619f72ad8c33e9c1e323afabe793008227099e488c71e8f9ecb404eeb32b49e7 SHA512 5755fe4f8d69ea8d58261e0068dc8dce9828c8134f53103f3afbba6d99cfe1e9f4a72f8004b96e6ac8d2bab6fb3c2cb458d9c3b333af78ee5eeb0883b5f763e8 WHIRLPOOL c1cded2d25de1f88f0ce944ef91946bcf423991e96bee1567a1d4ee46051e88771d09960ce23ea864ca73920e52fc64867ee0913f7a81e3ef3536e5d8b831bc4
+DIST libdmapsharing-2.9.36.tar.gz 759882 SHA256 844769a42a7e6083ce6eb2aa72d25fb3588eb6dabb284820e9031231a0f0c46a SHA512 cc93ac74fae115a29f634db44a367202b7e7f34d2e26b6c3e9a0774e53c963e614d5499757de1a02e20ad94e747feb71ae5fdd008fa335b79d82f8a06cb417d3 WHIRLPOOL d91de0e8a827ec499a3f4a84477b8e960ad28f988ad46b68ac849dc8c3917717689d7e8d38309a6120463687fc7e3ce3d2d3f1845862614ed930b15d6db0a17c
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.36.ebuild
similarity index 79%
rename from net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild
rename to net-libs/libdmapsharing/libdmapsharing-2.9.36.ebuild
index 9875f31807b3..89c363b5dd81 100644
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.32.ebuild
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.36.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-GCONF_DEBUG="no"
-
+EAPI=6
 inherit gnome2
 
 DESCRIPTION="A library that implements the DMAP family of protocols"
@@ -13,17 +11,16 @@ SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="3.0/2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection test"
 
 # Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
 # Doesn't seem to be used for anything...
-# TODO: implement tests (requires dev-libs/check)
 RDEPEND="
 	>=dev-libs/glib-2.36:2
 	x11-libs/gdk-pixbuf:2
 	>=net-dns/avahi-0.6[dbus]
-	>=net-libs/libsoup-2.32:2.4
+	>=net-libs/libsoup-2.48.0:2.4
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 	sys-libs/zlib
@@ -32,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
-	test? ( dev-libs/check )
+	test? ( >=dev-libs/check-0.9.4 )
 "
 
 src_prepare() {
@@ -46,5 +43,6 @@ src_configure() {
 	gnome2_src_configure \
 		--with-mdns=avahi \
 		$(use_enable introspection) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		$(use_enable test check)
 }
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index 916f005a4504..99944a02e996 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1 +1,2 @@
 DIST wandio-1.0.3.tar.gz 373723 SHA256 31dcc1402ace3023020446d6c7284fd84447f9b36e570206a179895e1eaa705b SHA512 fb86d022149d839e49805a35c9f5ada0b0bdf1174287d03c823145fbb0b3a5b3d7d78b5bfbf511da73cb06a22650f9a2d5cfd143dfa5b29eacdac1870977081c WHIRLPOOL 843ff98d2407897da9d20feb84287323b7aa2ac09ff23d5d7f4626e48321f7b6ee2fdfda4753bf16296ccf75c9dd5967c5c0c3fde8f62f1f73324980f5534e73
+DIST wandio-1.0.4.tar.gz 381793 SHA256 0fe4ae99ad7224f11a9c988be151cbdc12c6dc15872b67f101764d6f3fc70629 SHA512 247e3fe26ca0732acf50549284bdce34b3e0afd6b7bc7a44a2188c67a5fb38417feca23e9428acae903941c3d0a9f077e05aae879199deed64711615cd4174a2 WHIRLPOOL b8efa255f7d56717824eccb8df600099013a80bb2737b81441d228e3757ad60e1ab8cc8c7308b1dfa841bb5791edf154a60ebe93fc2fade9cfc95d88fe27f91a
diff --git a/net-libs/wandio/wandio-1.0.4.ebuild b/net-libs/wandio/wandio-1.0.4.ebuild
new file mode 100644
index 000000000000..329989c47ce3
--- /dev/null
+++ b/net-libs/wandio/wandio-1.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Library for transparent file I/O with compression"
+HOMEPAGE="http://research.wand.net.nz/software/libwandio.php"
+SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 http lzma lzo static-libs zlib"
+
+RDEPEND="
+	!<net-libs/libtrace-4
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	http? ( net-misc/curl )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with bzip2) \
+		$(use_with http) \
+		$(use_with lzma) \
+		$(use_with lzo) \
+		$(use_with zlib)
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9781b2128fe2..28b42d65de20 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
 DIST webkitgtk-2.12.3.tar.xz 11706664 SHA256 173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307 SHA512 d1a93c215cd5f2eb4d708b5a3898616d7851c57ccef473864eb5dd556909762a456e180ebe50c793959148490a80b3fe7f21fded7479b406922201ce44acf226 WHIRLPOOL 634ca12fb24355389b38f319dc37c3916af3a8b30bb97471151bf8b1baa38cec3ad0cb0aa4cc5d006b16bb737a5e18cd04e82165d1b8f952b0c018295fdc6aaf
+DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild
new file mode 100644
index 000000000000..d4f2baa8a58e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.6.0:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+# Control knob is private and set to off
+# seccomp? ( sys-libs/libseccomp )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 64f4ee6248a5..a0c243ba0b00 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,4 +4,5 @@ DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856
 DIST notmuch-0.20.2.tar.gz 652945 SHA256 f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec SHA512 08ab75df324f232edd7c36f73d01d7453c058ffb55c4f548afdf9abe843317c1d7066f21e7600c66c53577f7d31787914bf69743aa5d221e239e182452681c75 WHIRLPOOL 1698cb1b09046f50a57ebf23625a2dd68f86cac7cb1142be81e77b5625e49960cb2311c8acff44de0894238bced48853cdd72b7edf34109ecee0bc53d5b086fc
 DIST notmuch-0.21.tar.gz 663600 SHA256 d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3 SHA512 2485c422433be21f6bf89aaf997e1468c31a52029ddc8336e78a632b292c659569448c29813ea550ed27fb6815558522a451a7fa10e8fb3f87d9538b4dd7b01a WHIRLPOOL 303c6427822272834e3d95ac94760f0fbaf3f2947a984a6770a9b2918fe0fbad289ef95fb9a8300cb6db08ab3ef0ff56810b3a60879c6a2a3eac524689f0a2f0
 DIST notmuch-0.22.1.tar.gz 683286 SHA256 e739457794f3c2b363beffa3ed9e8a2786921031c80672f5b06d0880876a974b SHA512 b28ee8aa5af7172664ebc4d50c8830e645ad3e4945f5d162e44b627f3344de71b7525a444ae08f1c0650a7f94071f54cebcf3494214df80452b6ca954818deb9 WHIRLPOOL 85f95c9156a93e7b31d3d80e5b31f7e0a7678ff14e7c803abf9baf21a38edf4512c576ddbe540028aa45691260b0d230bf84c8c87c6eb18071d4f5f29c444a43
+DIST notmuch-0.22.2.tar.gz 683796 SHA256 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 SHA512 cc11feb8d1c2c7959a42e032c1e36e828290a8e8477af8936a27654117fbc2e080c71fe69ec92bd80763d9d3b163d45b7c0fa9fe9c4ec649600fa928110da4ee WHIRLPOOL 6aa41fa26a92a11393193b6f7e147b69de00f57fe712486805b2b7019d9bf9887d6d10962ef4144ca9ef07d6f63bbb1ddb2f7104c6eb89841285620d439743be
 DIST notmuch-0.22.tar.gz 682458 SHA256 d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a SHA512 0fd3860b4bce0fbf2648046a68b92d23d73604e82e05ee1b5913fc82985e67225b0f3a0977f71ad5251e7714a7111e8fd84ae0347f33475dddd8eb8d00fd2ed6 WHIRLPOOL 56e3ebbbf53092a6683b0c6ca945ed634f2e01b63625279a69221688905d0da688689ccc7a68d0af43c7ed9b48e696d85a6cb17a8d01c6e0facb27255ac00d3e
diff --git a/net-mail/notmuch/notmuch-0.22.2.ebuild b/net-mail/notmuch/notmuch-0.22.2.ebuild
new file mode 100644
index 000000000000..574809166b8e
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.22.2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	>=app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-2.6.20-r2:2.6
+	>=dev-libs/xapian-1.2.7-r2:=
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( >=dev-libs/gmime-2.6.20-r2:2.6[smime] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
+		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser )
+	"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+MY_PATCHES=( )
+
+bindings() {
+	local ret=0
+
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		"$@"
+		ret=$?
+		popd || die
+	fi
+
+	return $ret
+}
+
+pkg_pretend() {
+	if has_version '<net-mail/notmuch-0.18'; then
+		ewarn
+		ewarn "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.gz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	[[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	rm -f Makefile.config # assure that new Makefile.config will be generated
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	V=1 default
+	bindings python distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+
+	if use doc; then
+		pydocs() {
+			pushd docs || die
+			emake html
+			mv html ../python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		dobin notmuch-mutt
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd || die
+	fi
+
+	DOCS="" bindings python distutils-r1_src_install
+	use doc && bindings python dohtml -r python
+}
+
+pkg_preinst() {
+	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
+		elog "To enable notmuch support in mutt, add the following line into"
+		elog "your mutt config file, please:"
+		elog ""
+		elog "  source /etc/mutt/notmuch-mutt.rc"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-misc/curl/curl-7.50.2.ebuild b/net-misc/curl/curl-7.50.2.ebuild
index 9b1d00a13592..35ff12892cb4 100644
--- a/net-misc/curl/curl-7.50.2.ebuild
+++ b/net-misc/curl/curl-7.50.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 984948331b1c..5dbbb1c85afc 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-online-miners-3.14.3.tar.xz 258488 SHA256 907f0c1d2f4fcb762be9e3992d05bcc39d292d9c1246c2aca2b293b04c59ba7d SHA512 0ee3335a3a61b9976448d1cd01e4272d74a6690fc85360e4c16a743862fbfb9e1480e9d71beb0b0544c24ca92b0a968439a11447e13df4da54e8ec7430451774 WHIRLPOOL 30bcdbce850752989248497700c8b1bed60646c21e64e8991a8afb71e7ede9a58adb9066cb0c5bf5b50775a53081b2c334e70b31d10d1c9cf93a179d28791aef
 DIST gnome-online-miners-3.20.0.tar.xz 270364 SHA256 f46dac7743283385d2aeea588eeead216274d9f365e323b90f586de982336e36 SHA512 875c27a5c96a29a10cb61d537a1973c56d29dd556e2df12e06ba62824ab8238ad56642d216e074c620e2bc5cd2f5a42fbd9a30bbb85a97a929c7ab254366ca10 WHIRLPOOL 14c21069402a9edb0d5c130e9dc73e8275a77662297d30580919317edfb904532044291b3bda9e88b8cb64db847b7e936d1a0f7accd7d9620c8ebd116fd5c3d6
+DIST gnome-online-miners-3.20.1.tar.xz 271072 SHA256 fd67b9abad6233689a921d84dbe583a8b89d5ade7f1b5d2f348493888baa3429 SHA512 1a9764c8452127493a4917f8fe73c73a3473ebc88aae60ad53475b5857db5631856ee33ff95d94f41654163cf136e6d4a60d553c8adfa12554a3d654325e34e2 WHIRLPOOL aa8ccfb328ae77a492ed7080eb6c3ead07395f9c261ba6fd85e186a599d6a24272762d432eda6d2de36ad1f231da004fd73b569f54dd866fcab9680f512cb7f4
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
index 2e073fcfe6de..d360fb35de1a 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ RDEPEND="
 	>=net-libs/gnome-online-accounts-3.13.3
 	>=net-libs/libgfbgraph-0.2.2:0.2
 	>=net-libs/libzapojit-0.0.2
-	flickr? ( media-plugins/grilo-plugins[flickr] )
+	flickr? ( media-plugins/grilo-plugins:0.2[flickr] )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.20.1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.20.1.ebuild
new file mode 100644
index 000000000000..723cdc32b021
--- /dev/null
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.20.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Crawls through your online content"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="flickr"
+KEYWORDS="~amd64 ~x86"
+
+# libgdata[gnome] needed for goa support
+RDEPEND="
+	>=app-misc/tracker-1:0=
+	>=dev-libs/glib-2.35.1:2
+	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
+	media-libs/grilo:0.3
+	>=net-libs/gnome-online-accounts-3.13.3:=
+	>=net-libs/libgfbgraph-0.2.2:0.2
+	>=net-libs/libzapojit-0.0.2
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable flickr) \
+		--disable-static \
+		--enable-facebook \
+		--enable-google \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-windows-live
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 17e43525edaa..c37c3c36ceea 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,2 +1,3 @@
 DIST NetworkManager-1.0.12.tar.xz 3490836 SHA256 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e SHA512 926c0139dc7ade7bbc512f0d2e386a42a278aceff68996bc3a18fb1940f5d516f0ff2768459d6f50fd5669d72c15202307396bb3cf8b67c3dbac19db484b971c WHIRLPOOL 6178af61fb30a7e8b72cc05296a014a5be5b10fed41cd5385f0bebae1fa22519c83cf8c359479372f063fc2b891715015454c53cd4f1f1516fc03bca76a552ac
 DIST NetworkManager-1.2.4.tar.xz 3728788 SHA256 19bfb7306dd472d010443a8027d91f9fd50fe6e0c5aa4ea8083845de0fa38faa SHA512 83fa179c0f360c7f40504cf58275e28638b5a986458c99adc85567595ca170ac3d081ffa0c99e5619c97d4a3228e5318e613330894547ad3438eaa2bfcc1f28b WHIRLPOOL 625cf2a32f5fb1e5ae537f2285f6945ca14f438959fb5556b490a90fe16eddcfb22e84c82f8f0f479f2387ec54ba292b18f28c0676375d729f9bb6a435d9e12b
+DIST NetworkManager-1.4.0.tar.xz 3699568 SHA256 c4d5e075998a291074501602a5068a7e54d9e0f2658aba079d58145d65be531d SHA512 2580e885684f6ad464eebdf9e0dab5432d4d45f0f4127af7f8947be16fc5ce84a5cc090e195b68619c14e218d9cffcde1615400c19326e58bdac8fdf7b53fb46 WHIRLPOOL 39607ac0606039c242b2033b9e540c3beb88e7f48fdb8188d942341a57e097dc0e9c7bde248b6d9ae65bd3ac94df83b5e7d7a371baf7f32c8542581c3bdf778c
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 420c24a93efa..138205d03bb4 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
@@ -13,16 +13,19 @@
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
 			getting ip</flag>
 		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
+		<flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg>
+			in libnm.</flag>
 		<flag name="modemmanager">Enable support for mobile broadband devices
 			using <pkg>net-misc/modemmanager</pkg></flag>
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
+		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
 		<flag name="ppp">Enable support for mobile broadband and PPPoE
 			connections using <pkg>net-dialup/ppp</pkg></flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
 			DNS information</flag>
 		<flag name="teamd">Enable Teamd control support</flag>
 		<flag name="wifi">Enable support for wifi and 802.1x security using
-		    <pkg>net-wireless/wpa_supplicant</pkg></flag>
+			<pkg>net-wireless/wpa_supplicant</pkg></flag>
 		<flag name="wext">Enable support for the deprecated Wext (Wireless
 			Extensions) API; needed for some older drivers (e.g. ipw2200,
 			ndiswrapper)</flag>
diff --git a/net-misc/networkmanager/networkmanager-1.4.0.ebuild b/net-misc/networkmanager/networkmanager-1.4.0.ebuild
new file mode 100644
index 000000000000..e5aa609cd5a6
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.4.0.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
+json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
+systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: need multilib janson (linked to libnm.so)
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=
+	>=sys-auth/polkit-0.106
+	net-libs/libndp
+	>=net-libs/libsoup-2.40:2.4=
+	net-misc/iputils
+	sys-libs/readline:0
+	>=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( dev-libs/jansson )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	ofono? ( net-misc/ofono )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	!systemd? (
+		!consolekit? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+	)
+	teamd? ( >=net-misc/libteam-1.9 )
+"
+RDEPEND="${COMMON_DEPEND}
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	else
+		return 0
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		mkdir man || die
+		find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
+	else
+		# libnl, libndp are only used for executables, not libraries
+		myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
+	fi
+
+	# ifnet plugin always disabled until someone volunteers to actively
+	# maintain and fix it
+	# Also disable dhcpcd support as it's also completely unmaintained
+	# and facing bugs like #563938 and many others
+	#
+	# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+	# still not ready for removing that lib
+	ECONF_SOURCE=${S} \
+	runstatedir="/run" \
+		gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		--disable-lto \
+		--disable-config-plugin-ibft \
+		--disable-ifnet \
+		--disable-qt \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-libnm-glib \
+		--with-nmcli=yes \
+		--with-udev-dir="$(get_udevdir)" \
+		--with-config-plugins-default=keyfile \
+		--with-iptables=/sbin/iptables \
+		$(multilib_native_with libsoup) \
+		$(multilib_native_enable concheck) \
+		--with-crypto=$(usex nss nss gnutls) \
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit upower)) \
+		$(multilib_native_use_with audit libaudit) \
+		$(multilib_native_use_enable bluetooth bluez5-dun) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable json json-validation) \
+		$(multilib_native_use_enable ppp) \
+		$(use_with dhclient) \
+		--without-dhcpcd \
+		$(multilib_native_use_with modemmanager modem-manager-1) \
+		$(multilib_native_use_with ncurses nmtui) \
+		$(multilib_native_use_with ofono) \
+		$(multilib_native_use_with resolvconf) \
+		$(multilib_native_use_with selinux) \
+		$(multilib_native_use_with systemd systemd-journal) \
+		$(multilib_native_use_enable teamd teamdctl) \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable vala) \
+		--without-valgrind \
+		$(multilib_native_use_with wext) \
+		$(multilib_native_use_enable wifi) \
+		"${myconf[@]}"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in api libnm libnm-util libnm-glib; do
+			ln -s "${S}"/docs/${d}/html docs/${d}/html || die
+		done
+	fi
+
+	# Disable examples
+	# https://bugzilla.gnome.org/show_bug.cgi?id=769711
+	cat > examples/Makefile <<-EOF
+	.PHONY: all check install
+	all:
+	check:
+	install:
+	EOF
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake all-am
+		emake -C shared
+		emake -C introspection # generated headers, needed for libnm
+		emake -C libnm-core
+		emake -C libnm
+		emake -C libnm-util
+		emake -C libnm-glib
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		emake DESTDIR="${D}" install-am
+		emake DESTDIR="${D}" install -C shared
+		emake DESTDIR="${D}" install -C introspection
+		emake DESTDIR="${D}" install -C libnm-core
+		emake DESTDIR="${D}" install -C libnm
+		emake DESTDIR="${D}" install -C libnm-util
+		emake DESTDIR="${D}" install -C libnm-glib
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	# Remove empty /run/NetworkManager
+	rmdir "${D}"/run/NetworkManager "${D}"/run || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch b/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch
index 19bd08bfa5f5..9cc7b61a6ab5 100644
--- a/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch
+++ b/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch
@@ -1,5 +1,5 @@
 diff --git a/cipher-ctr-mt.c b/cipher-ctr-mt.c
-index fdc9b2f..3ffe6d1 100644
+index fdc9b2f..300cd90 100644
 --- a/cipher-ctr-mt.c
 +++ b/cipher-ctr-mt.c
 @@ -127,7 +127,7 @@ struct kq {
@@ -160,7 +160,7 @@ index fdc9b2f..3ffe6d1 100644
  
  		c->state = HAVE_NONE;
  		for (i = 0; i < NUMKQ; i++) {
-@@ -409,11 +481,9 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
+@@ -409,11 +481,14 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
  	}
  
  	if (c->state == (HAVE_KEY | HAVE_IV)) {
@@ -171,11 +171,16 @@ index fdc9b2f..3ffe6d1 100644
 -			pthread_join(c->tid[i], NULL);
 +		/* tell the pregen threads to exit */
 +		stop_and_join_pregen_threads(c);
++
++#ifdef __APPLE__
++		/* reset the exit flag */
++		c->exit_flag = FALSE;
++#endif /* __APPLE__ */
 +
  		/* Start over getting key & iv */
  		c->state = HAVE_NONE;
  	}
-@@ -444,10 +514,12 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
+@@ -444,10 +519,12 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
  		/* Start threads */
  		for (i = 0; i < CIPHER_THREADS; i++) {
  			debug("spawned a thread");
@@ -189,7 +194,7 @@ index fdc9b2f..3ffe6d1 100644
  			pthread_cond_wait(&c->q[0].cond, &c->q[0].lock);
  		pthread_mutex_unlock(&c->q[0].lock);
  	}
-@@ -461,15 +533,10 @@ void
+@@ -461,15 +538,10 @@ void
  ssh_aes_ctr_thread_destroy(EVP_CIPHER_CTX *ctx)
  {
  	struct ssh_aes_ctr_ctx *c;
@@ -208,7 +213,7 @@ index fdc9b2f..3ffe6d1 100644
  }
  
  void
-@@ -481,7 +548,9 @@ ssh_aes_ctr_thread_reconstruction(EVP_CIPHER_CTX *ctx)
+@@ -481,7 +553,9 @@ ssh_aes_ctr_thread_reconstruction(EVP_CIPHER_CTX *ctx)
  	/* reconstruct threads */
  	for (i = 0; i < CIPHER_THREADS; i++) {
  		debug("spawned a thread");
@@ -218,7 +223,7 @@ index fdc9b2f..3ffe6d1 100644
  	}
  }
  
-@@ -489,18 +558,13 @@ static int
+@@ -489,18 +563,13 @@ static int
  ssh_aes_ctr_cleanup(EVP_CIPHER_CTX *ctx)
  {
  	struct ssh_aes_ctr_ctx *c;
diff --git a/net-misc/openvpn/openvpn-2.3.12.ebuild b/net-misc/openvpn/openvpn-2.3.12.ebuild
index b1ca60cb9d0f..30352724e92d 100644
--- a/net-misc/openvpn/openvpn-2.3.12.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.12.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
diff --git a/net-misc/spice-gtk/spice-gtk-0.31.ebuild b/net-misc/spice-gtk/spice-gtk-0.31.ebuild
index 3682e02a36a3..cfec48ec6624 100644
--- a/net-misc/spice-gtk/spice-gtk-0.31.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.31.ebuild
@@ -85,10 +85,6 @@ DEPEND="${RDEPEND}
 # dev-lang/vala:0.14
 # dev-lang/perl
 
-# Prevent sandbox violations, bug #581836
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-x11-libs.patch
 	epatch_user
@@ -99,6 +95,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	local myconf
 	local audio="no"
 
@@ -148,10 +149,20 @@ src_configure() {
 }
 
 src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	multibuild_foreach_variant run_in_build_dir default
 }
 
 src_test() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	multibuild_foreach_variant run_in_build_dir default
 }
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild
index 0fac3468ebeb..3c026b18a144 100644
--- a/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild
@@ -75,10 +75,6 @@ DEPEND="${RDEPEND}
 # dev-lang/vala:0.14
 # dev-lang/perl
 
-# Prevent sandbox violations, bug #581836
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-x11-libs.patch
 	epatch_user
@@ -89,6 +85,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	local myconf
 
 	if use vala ; then
@@ -121,6 +122,15 @@ src_configure() {
 	econf ${myconf}
 }
 
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
 src_install() {
 	default
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
index ea87c5ac53e0..7477ddfe6cce 100644
--- a/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
@@ -79,10 +79,6 @@ DEPEND="${RDEPEND}
 # dev-lang/vala:0.14
 # dev-lang/perl
 
-# Prevent sandbox violations, bug #581836
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-x11-libs.patch
 	epatch_user
@@ -93,6 +89,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	local myconf
 
 	if use vala ; then
@@ -125,6 +126,15 @@ src_configure() {
 	econf ${myconf}
 }
 
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
 src_install() {
 	default
 
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 0fd61c85ef37..177090972c7a 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -78,10 +78,6 @@ DEPEND="${RDEPEND}
 # dev-lang/vala:0.14
 # dev-lang/perl
 
-# Prevent sandbox violations, bug #581836
-# https://bugzilla.gnome.org/show_bug.cgi?id=581836
-addpredict /dev
-
 src_prepare() {
 	epatch_user
 
@@ -91,6 +87,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
 	local myconf
 
 	if use vala ; then
@@ -123,6 +124,15 @@ src_configure() {
 	econf ${myconf}
 }
 
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
 src_install() {
 	default
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index bfc0f902c5c4..94b50e4ae2ea 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2016.01.01.tar.gz 1874602 SHA256 732f37c99d71b4239d72d61dd32214b5a5a618671fb0629c8f8deb28209a172c SHA512 fdb022bed426250e5ee1c2bcc1354dd195c0f9793ca479ca8ca4cfe2f71e07ba100b0dbcda2fb9f310308ab130587d06b16a6a86f9036f0d196b317d2e5b5e92 WHIRLPOOL 152e709ba15264c35a89644ea0d4793bb47c82b317e54043ccfff72e40bdf95e42d76605e801233632d3863537a945cfb9ecc2f75245171b8de31b51ce6af801
-DIST youtube-dl-2016.09.03.tar.gz 2358006 SHA256 4b93e573325bb37d4f660d5f1964f859f5197aea1a9ac8693ec05132c87b8f8c SHA512 52c1dc035bc30d7db5268fcdb24965541f72825aeb05356cd3778b14524824444078f2f51a05c95bc13446ed571f4a0b4c12e869d5cd55970f2c06c2dc19768e WHIRLPOOL ce5f7ccc4a25360ae85eeaf1aedbc8793d8beb42ef5b967d1ab3684a44418a7e965a5d02114df49c61390ac2b43b4a891557ebd218a13b7e14fce08e72560e65
 DIST youtube-dl-2016.09.04.1.tar.gz 2362102 SHA256 3a84cab74d89f3dbe28f24cc8a012a6f7845ffb1b9d7131cd1e58fefaef035dd SHA512 c96bd88d61d078137bf241477b4d617c660fced860e1456694a15518cc83780803c3a14ea05107b5195fd5bb611f2c1a3675407d9a2f21b236995b8e9d544964 WHIRLPOOL 2e833a7cacd464163bbca9eef4c6e5e3841db0225e290025772c467e6e66ebd430f54aea0057ed13706e2a99050dee48e2527b6f611752f2fde1c17f347cd81f
+DIST youtube-dl-2016.09.08.tar.gz 2373179 SHA256 c45af2fb1041c25ee9b2283f5c0bd32106943844425541d684e17310e216b8b7 SHA512 06c0d2b733decd06b035c0381cce806fb9889f2a5d8829d58c21bd5aece5326fef1f3289f467dddf74571d4da966edfca68e697a3f4e2a9caaed98bac3c5b005 WHIRLPOOL 275bff1e7931ee2333d07b05813d0c2ab1c17f7ef18ee6eef26fd6f3213b002883b2073085f79cf15181e7a9c8f9faa433db747f99cce38b7359ee749d4daed3
diff --git a/net-misc/youtube-dl/youtube-dl-2016.09.04.1.ebuild b/net-misc/youtube-dl/youtube-dl-2016.09.04.1.ebuild
index 1e3fe7079813..be4ed48fbcaf 100644
--- a/net-misc/youtube-dl/youtube-dl-2016.09.04.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.09.04.1.ebuild
@@ -16,8 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="offensive test"
 
-DEPEND="
+RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
 	test? ( dev-python/nose[coverage(+)] )
 "
 
diff --git a/net-misc/youtube-dl/youtube-dl-2016.09.03.ebuild b/net-misc/youtube-dl/youtube-dl-2016.09.08.ebuild
similarity index 98%
rename from net-misc/youtube-dl/youtube-dl-2016.09.03.ebuild
rename to net-misc/youtube-dl/youtube-dl-2016.09.08.ebuild
index 1e3fe7079813..be4ed48fbcaf 100644
--- a/net-misc/youtube-dl/youtube-dl-2016.09.03.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.09.08.ebuild
@@ -16,8 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="offensive test"
 
-DEPEND="
+RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
 	test? ( dev-python/nose[coverage(+)] )
 "
 
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index aba829c27973..36b797369d09 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,8 +17,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="test"
 
-DEPEND="
+RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[coverage(+)] )
 "
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 1cf06ad4199c..802efa10c8d6 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Gilles Dartiguelongue <eva@gentoo.org> (11 Sep 2016)
+# networkmanager USE masked due to missing keywords
+gnome-extra/nm-applet teamd
+
+# Gilles Dartiguelongue <eva@gentoo.org> (11 Sep 2016)
+# Opt-out of ofono support until there is a user request,
+# see also pulseaudio/connman
+net-misc/networkmanager ofono
+
 # Tobias Klausmann <klausman@gentoo.org> (04 Jul 2016)
 # Mask USE=test since it implies USE=valgrind
 net-mail/notmuch test
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f8a0fdd95cd1..92c6bc5ed45c 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Gilles Dartiguelongue <eva@gentoo.org> (11 Sep 2016)
+# networkmanager USE masked due to missing keywords
+gnome-extra/nm-applet teamd
+
+# Gilles Dartiguelongue <eva@gentoo.org> (11 Sep 2016)
+# Opt-out of ofono support until there is a user request,
+# see also pulseaudio/connman
+net-misc/networkmanager ofono
+ 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # Enable numa support on supported architectures
 dev-db/percona-server -numa
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 6770f78066ef..a15e8abcbc0d 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Gilles Dartiguelongue <eva@gentoo.org> (11 Sep 2016)
+# networkmanager USE masked due to missing keywords
+gnome-extra/nm-applet teamd
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jun 2016)
 # Missing keywords on app-text/gspell - bug #587368
 >=app-editors/gedit-3.20 spell
diff --git a/profiles/hardened/linux/musl/arm64/make.defaults b/profiles/hardened/linux/musl/arm64/make.defaults
index 2e57029c0ffd..4bf2d786572b 100644
--- a/profiles/hardened/linux/musl/arm64/make.defaults
+++ b/profiles/hardened/linux/musl/arm64/make.defaults
@@ -16,5 +16,5 @@ FCFLAGS="${CFLAGS}"
 ABI="arm64"
 DEFAULT_ABI="arm64"
 MULTILIB_ABIS="arm64"
-CHOST_arm="${CHOST}"
-LIBDIR_arm="lib"
+CHOST_arm64="${CHOST}"
+LIBDIR_arm64="lib"
diff --git a/profiles/package.mask b/profiles/package.mask
index d68dda77f5c3..77e07cb03a13 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,29 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (11 Sep 2016)
+# Mask for removal in 30 days. Uses deprecated conduit-1.0*
+# Upstream suggests using dev-haskell/conduit-combinators
+# instead.
+dev-haskell/base64-conduit
+
+# Sergei Trofimovich <slyfox@gentoo.org> (11 Sep 2016)
+# Mask for removal in 30 days. >=sci-mathematics/agda-2.4
+# now provides 'agda' binary.
+sci-mathematics/agda-executable
+
+# Patrice Clement <monsieurp@gentoo.org> (10 Sep 2016)
+# Upstream dead. This package tries very hard to outsmart autotools and
+# reinvent the wheel by coming up with its own configure script. A complete
+# disaster resulting in a gigantic wave of QA errors.
+# Masked for removal in 30 days.
+dev-libs/vrb
+
+# Pawel Hajdan jr <phajdan.jr@gentoo.org> (10 Sep 2016)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-55
+
 # Martin Gysel <me@bearsh.org> via g-p-m (09 Sep 2016)
 # Versions currently in Portage are old and block removal of other
 # packages. Current versions require building against modified versions
@@ -582,6 +605,7 @@ dev-ruby/metasploit-model:1.0
 ~dev-qt/qtx11extras-5.7.0
 ~dev-qt/qtxml-5.7.0
 ~dev-qt/qtxmlpatterns-5.7.0
+=dev-qt/qt-docs-5.7*
 
 # Michael Palimaka <kensington@gentoo.org> (11 Aug 2016)
 # No longer works. Masked for removal in 30 days.
@@ -634,11 +658,6 @@ media-video/miro
 # Bugs #590272, #590270, #590268, #590266 etc.
 =sci-libs/fftw-3.3.5
 
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (01 Aug 2016)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-54
-
 # Michał Górny <mgorny@gentoo.org> (18 Jul 2016)
 # Pre-release of a complete rewrite, provided for early testing. Not all
 # functionality is provided yet. Use --pretend to make sure correct
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index 4636d6746dda..3d07974b1178 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -3,9 +3,14 @@
 # $Id$
 
 
+# Fabian Groffen <grobian@gentoo.org> (10 Sep 2016)
+# revbump for adding libcxx dependency, which we already have, so avoid
+# the hassle
+=sys-devel/llvm-3.8.1-r2
+
 # Fabian Groffen <grobian@gentoo.org> (31 May 2015)
 # fails to compile due to some missing compilerrt stuff, hints at asan,
-# not sure what the problem actually is
+# not sure what the problem actually is, 3.7 and 3.8 compile just fine
 =sys-devel/llvm-3.6*
 =sys-devel/clang-3.6*
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 76eef10f6eba..4b06a06332c2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -784,6 +784,13 @@ app-forensics/openscap:rpm - Compiles the RPM probes
 app-forensics/openscap:sce - Enables Script Check Engine (SCE) support
 app-forensics/openscap:sql - Build the sql independant probes
 app-forensics/ovaldi:rpm - Enable the RPM probes
+app-forensics/quickfuzz:archs - support archive formats
+app-forensics/quickfuzz:codes - support cource code formats
+app-forensics/quickfuzz:docs - support document formats
+app-forensics/quickfuzz:imgs - support image formats
+app-forensics/quickfuzz:media - support media formats
+app-forensics/quickfuzz:net - support networking formats
+app-forensics/quickfuzz:pki - support PKI formats
 app-forensics/sleuthkit:aff - Enable extra aff formats
 app-forensics/sleuthkit:ewf - Enable libewf support
 app-i18n/anthy:canna-2ch - Enable support for app-dicts/canna-2ch
@@ -1542,6 +1549,7 @@ dev-haskell/biosff:fclip - Build the fclip executable.
 dev-haskell/biosff:flower - Build the flower executable.
 dev-haskell/biosff:frecover - Build the frecover executable.
 dev-haskell/blaze-builder-enumerator:newbuilder - use bytestring-builder instead of blaze-builder-0.3
+dev-haskell/bytes:test-doctests - Enable the doctest suite when using the enable-tests option for cabal.
 dev-haskell/c2hs:regression - run regression tests
 dev-haskell/cabal-install:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/cabal-install:noprefs - Ignore 'preferred-versions' file from hackage's tarball.
@@ -1601,6 +1609,7 @@ dev-haskell/hdbc-odbc:buildstresstest - Build stress test
 dev-haskell/highlighting-kate:executable - Build the Highlight executable.
 dev-haskell/highlighting-kate:pcre-light - Use the pcre-light library instead of regex-pcre-builtin.
 dev-haskell/hlint:gpl - Use GPL libraries, specifically hscolour.
+dev-haskell/hps:build-exec - Build the `hps-fractals' executable
 dev-haskell/hs3:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/hslogger:buildtests - Build the executable to run unit tests.
 dev-haskell/hslua:apicheck - Compile Lua with -DLUA_USE_APICHECK..
@@ -1612,10 +1621,12 @@ dev-haskell/http-client:network-uri - Get Network.URI from the network-uri packa
 dev-haskell/httpd-shed:buildexamples - Build example executables.
 dev-haskell/httpd-shed:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/hxt:network-uri - Get Network.URI from the network-uri package.
+dev-haskell/icalendar:network-uri - use network-uri package
 dev-haskell/json:generic - Add support for generic encoder (dev-haskell/syb)
 dev-haskell/json:mapdict - Encode Haskell maps as JSON dicts
 dev-haskell/json:parsec - Add support for parsing with Parsec
 dev-haskell/json:pretty - Add support for using pretty printing combinators
+dev-haskell/language-dot:executable - Build the `ppdot' executable
 dev-haskell/lens:benchmark-uniplate - Enable benchmarking against Neil Mitchell's uniplate library for comparative performance analysis. Defaults to being turned off to avoid the extra dependency.
 dev-haskell/lens:dump-splices - Build and run the doctests test-suite.
 dev-haskell/lens:inlining - Generate inline pragmas when using template-haskell. This defaults to enabled, but you can to shut it off to benchmark the relative performance impact, or as last ditch effort to address compile errors resulting from the myriad versions of template-haskell that all purport to be 2.8.
@@ -1629,6 +1640,7 @@ dev-haskell/lens:test-hunit - You can disable the hunit test suite with -f-test-
 dev-haskell/lens:test-properties - Build the properties test if we're building tests
 dev-haskell/lens:trustworthy - Assert that we are trustworthy when we can
 dev-haskell/lifted-async:monad-control-1 - Use moand-control == 1.*
+dev-haskell/linear:template-haskell - You can disable the use of the `template-haskell` package using `-f-template-haskell`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/monad-control:instancest - If enabled this package will export MonadBaseControl instances for the lazy and strict ST monad. If disabled these instances are only exported when base >= 4.4. If enabled it is required that the transformer-base package exports MonadBase instances for ST. It will do this by default.
 dev-haskell/monad-logger:template_haskell - Enable Template Haskell support.
 dev-haskell/monad-par:chaselev - Use Chase-Lev Deques for higher-perf work-stealing.
@@ -1686,6 +1698,9 @@ dev-haskell/tasty-quickcheck:old-quickcheck - Use Quick-Check < 2.7.
 dev-haskell/texmath:executable - Compile test executable.
 dev-haskell/texmath:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/text:developer - operate in developer mode
+dev-haskell/thyme:bug-for-bug - bug-for-bug compatibility with time
+dev-haskell/thyme:lens - use the full lens package
+dev-haskell/thyme:show-internal - instance Show of internal representation
 dev-haskell/tls:compat - Accept SSLv2 compatible handshake.
 dev-haskell/tls:network - Use the base network library.
 dev-haskell/transformers-base:orphaninstances - Build instances for orphan datatypes.
@@ -1936,6 +1951,7 @@ dev-libs/actor-framework:riac - Runtime inspection and configuration
 dev-libs/actor-framework:static - Provides a static build
 dev-libs/actor-framework:test - Builds the provided unit tests
 dev-libs/antlr-c:debugger - Compiles debug info into the library
+dev-libs/appstream-glib:stemmer - Add word stemming via dev-libs/snowball-stemmer.
 dev-libs/apr:older-kernels-compatibility - Enable binary compatibility with older kernels
 dev-libs/apr:urandom - Use /dev/urandom instead of /dev/random
 dev-libs/apr-util:libressl - Use dev-libs/libressl instead of dev-libs/openssl for 'openssl' USE flag
@@ -3252,6 +3268,7 @@ gnome-extra/libgsf:gtk - Enable use of gdk in thumbnailer
 gnome-extra/nemo:packagekit - Use packagekit to search for programs to open unknown file types
 gnome-extra/nemo:tracker - Add support for app-misc/tracker search
 gnome-extra/nm-applet:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
+gnome-extra/nm-applet:teamd - Enable teamd configuration editor
 gnome-extra/sushi:office - Support viewing file formats such as generated by app-office/libreoffice
 gnome-extra/synapse:plugins - Build support for plugins using librest
 gnome-extra/synapse:zeitgeist - Add support for Zeitgeist event tracking system
@@ -3636,6 +3653,7 @@ mail-filter/postgrey:targrey - Enables the targrey patch
 mail-filter/qmail-scanner:spamassassin - Build faster mail-filter/spamassassin checks into qmail-scanner
 mail-filter/rmilter:dkim - Enable support for DomainKeys Identified Mail
 mail-filter/rmilter:memcached - Enable support for memcached
+mail-filter/rspamd:fann - Enable neural network plugin (requires sci-mathematics/fann).
 mail-filter/spamassassin:bayes - Require a database (MySQL, SQLite, Postgres, or BerkDB) backend to enable the Bayesian filtering database.
 mail-filter/spamassassin:cron - Install a cron job to update SpamAssassin's rules daily.
 mail-filter/spamassassin:qmail - Build qmail functionality and docs
@@ -6226,8 +6244,10 @@ net-misc/networkmanager:connection-sharing - Use net-dns/dnsmasq and net-firewal
 net-misc/networkmanager:consolekit - Use sys-auth/consolekit for session tracking
 net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting ip
 net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting ip
+net-misc/networkmanager:json - Enable JSON validation via dev-libs/jansson in libnm.
 net-misc/networkmanager:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 net-misc/networkmanager:nss - Use dev-libs/nss for cryptography
+net-misc/networkmanager:ofono - Use net-misc/ofono for telephony support.
 net-misc/networkmanager:ppp - Enable support for mobile broadband and PPPoE connections using net-dialup/ppp
 net-misc/networkmanager:resolvconf - Use net-dns/openresolv for managing DNS information
 net-misc/networkmanager:teamd - Enable Teamd control support
@@ -7087,7 +7107,6 @@ sci-mathematics/nusmv:minisat - Enable support for MiniSat
 sci-mathematics/octave:glpk - Add support for sci-mathematics/glpk for linear programming
 sci-mathematics/octave:graphicsmagick - Add support for media-gfx/graphicsmagick
 sci-mathematics/octave:gui - Enable the graphical user interface
-sci-mathematics/octave:jit - (EXPERIMENTAL) enable JIT compiler
 sci-mathematics/octave:qhull - Add support for media-libs/qhull, to allow `delaunay', `convhull', and related functions
 sci-mathematics/octave:qrupdate - Add support for sci-libs/qrupdatefor QR and Cholesky update functions
 sci-mathematics/octave:sparse - Add enhanced support for sparse matrix algebra with SuiteSparse
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index 988fe246fa0e..a41476f150e5 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -2,3 +2,4 @@ DIST rebase-1602.tar.xz 101007300 SHA256 26257dc10a6aba54024772956ae03e8530d4b21
 DIST rebase-1604.tar.xz 102817536 SHA256 f234eadba5aa30573d664c9d9caab480ecbb383f0beab256e149296ee5d982ef SHA512 8ba6a24a8cf1b71a1ac2e0fb1634c0307d570af459fc940639046bd57362f3750e5f0390bcb7f3c7d2b924e1a5bf02825b5feb87a1f7d670d755f3b843df91a3 WHIRLPOOL 8ccaf435d7582fe1b86676037aaf7b0db742cd8d998a55d400f941a94e53731e1814028e1fed1be46f53bea702b570a1bffd73ba328ee06db17adcd731e3733c
 DIST rebase-1607.tar.xz 111124484 SHA256 2d795db3cc8cf7ff22eda983334e480b9c7b61c5b5ed9d38e2d626489fc4cefe SHA512 b166f75d6d82efe68f9e2521e26c7dc1bf34dde168d6eb94195f2f938316b0c7d06a11684de7d71e9bef2f3051a12c848c87a0d48bb6e148f6f84e9f694ced48 WHIRLPOOL 823054e6b366b707ba1be105fd6172f315358ba07ac8cfb7bbafdac3b9f14718e3406bb4b1c048b18dc8422ead4da09512b61758470bd5ca6a8d9141ebb5c578
 DIST rebase-1608.tar.xz 113417576 SHA256 ce8872adbe09c756af4bded43bde43e45d82b14642454fad05da8deef271bb81 SHA512 989d353cb9d73039d6c08805c4d32dbef1bdd37683f4c2ead5fa4889eae05bf3bdba54214d199b87961d8ace4d950f21dbc749e955867f8c6ccac766c7a06520 WHIRLPOOL bc89aa9230680ac08d3c17f7068bb45cb28dbf45038ffda5c2b4660fe366cdc32376ca32439953a2faa7524c6a5c4811a124288b85cf8320ef324458e3957d70
+DIST rebase-1609.tar.xz 140865364 SHA256 0799f4a1dae79eaea6629425f6dae104951b94777dc58866adceb4277c577f51 SHA512 3a06a67c7df78f3eb6214dece1f2045ce2610cf34efc8f9eb34b97ca2aa818ea9b52124da1b44895a5a53ec45b19bb78f0cc036b2053e28f1cb72087cd42ad35 WHIRLPOOL fcd5ff5674465cab269dbe8c4f7e5c2c33f6b3b2a515e3f1c1a8c8b60fc68ecca1f48ea4c363ce52b77ddfd50e8fc9c22aad69b7ebc190ccdcfcd2b52d3bc27b
diff --git a/sci-biology/rebase/rebase-1609.ebuild b/sci-biology/rebase/rebase-1609.ebuild
new file mode 100644
index 000000000000..47f2e4366830
--- /dev/null
+++ b/sci-biology/rebase/rebase-1609.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PV=${PV#1}
+
+DESCRIPTION="A restriction enzyme database"
+HOMEPAGE="http://rebase.neb.com"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emboss minimal"
+
+RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="binchecks strip"
+
+src_compile() {
+	if use emboss; then
+		echo; einfo "Indexing Rebase for usage with EMBOSS."
+		mkdir REBASE || die
+		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
+				-protofile proto.${MY_PV} -equivalences \
+				|| die "Indexing Rebase failed."
+		echo
+	fi
+}
+
+src_install() {
+	if ! use minimal; then
+		insinto /usr/share/${PN}
+		doins withrefm.${MY_PV} proto.${MY_PV}
+	fi
+	newdoc REBASE.DOC README
+	if use emboss; then
+		insinto /usr/share/EMBOSS/data/REBASE
+		doins REBASE/embossre.{enz,ref,sup}
+		insinto /usr/share/EMBOSS/data
+		doins REBASE/embossre.equ
+	fi
+}
diff --git a/sci-libs/gerris/Manifest b/sci-libs/gerris/Manifest
index 6e112fe71c3a..38fcf1e32e53 100644
--- a/sci-libs/gerris/Manifest
+++ b/sci-libs/gerris/Manifest
@@ -1,3 +1 @@
-DIST gerris-snapshot-120731.tar.gz 2640044 SHA256 2a032e3418672057d1d83a5280380241d8865d4cc1a53f7bc21e95acd3a5f8fb SHA512 7ec58b715c4e52462c8e0507d34ccf554c71b3bf3575eafd8fb59002c60dcd91a749cfc53b7a4eda1822571777736dab15b0e75594b1d97b4627f72a97defb46 WHIRLPOOL abce090c4f79ee9bf4982ca9bc673ca43c6e40488e308f37a549348eb900ca1d74a8d95b59898bd173167cb849bd5afeca1e38be300d66d711f2a9225108e410
-DIST gerris-snapshot-130531.tar.gz 2822863 SHA256 808a690b928d7a90067e2115121e529311f3631882db46cecdae1468334912d5 SHA512 7372cfae4442f9daf996091d4043c3649976f937eaf6b27a8b65f58b316d26c0cb9d106da6f041ce58b2149d193ab311ed0c65d8834d42bcfebe0b7ec073be9e WHIRLPOOL be02b7b189dd2b27e00ac0cb4af10997e669afef92f4a4377f8117dfda35fe9fd894b750b605dee805288ece2f8ba4072f1d7d6570411eaab51ec8336e5c4eb9
 DIST gerris-snapshot-131206.tar.gz 2841686 SHA256 d5346a362b104ccc858c4b79938727d56c4654b103c268e54cf3aa56d0b55b39 SHA512 b3855d51eea04c496d2e5f662c148560d9ab8d5dfa97e4f7d1c22c70405b9b801b46f30aa0d159b1bd6a8182f171a1649b5f510f0e13feeb55f29cafe57b45dd WHIRLPOOL 81027d9c4c9bf44b542e1161e3238711f321b5db581b0538d5c7addc4dd5229c90f787216d05a689e287ba511546b4e7cc2fb9664bcfb9098e421722a5d8e0fd
diff --git a/sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch b/sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch
index f05512efbddf..a52c78bf77c8 100644
--- a/sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch
+++ b/sci-libs/gerris/files/gerris-20130531-hypre-no-mpi.patch
@@ -1,7 +1,7 @@
 patch to allow gerris to use hypre without mpi
 
---- configure.ac	2013-05-30 23:57:18.000000000 -0700
-+++ configure.ac.new	2013-07-22 13:52:36.083974663 -0700
+--- a/configure.ac
++++ b/configure.ac
 @@ -336,7 +336,7 @@
  
  # Build hypre module if HYPRE is installed
diff --git a/sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch b/sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch
index 21d6810bbd2b..d4c7bfae15bb 100644
--- a/sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch
+++ b/sci-libs/gerris/files/gerris-20130531-lis-matrix-csr.patch
@@ -1,5 +1,5 @@
---- modules/lis.c.orig	2013-07-22 15:34:05.346631560 -0700
-+++ modules/lis.c	2013-07-22 15:33:28.621427315 -0700
+--- a/modules/lis.c
++++ b/modules/lis.c
 @@ -45,7 +45,7 @@
  			    g_array_index (stencil->coeff, double, j), 
  			    A);
diff --git a/sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch b/sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch
index 4c8985ce5e77..1c25a8f516b6 100644
--- a/sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch
+++ b/sci-libs/gerris/files/gerris-20130531-use-blas-lapack-system.patch
@@ -1,5 +1,5 @@
---- modules/Makefile.am.orig	2013-07-22 14:13:10.339130133 -0700
-+++ modules/Makefile.am	2013-07-22 14:15:10.770813929 -0700
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
 @@ -105,7 +105,7 @@
  libstokes2D_la_LIBADD = $(GFS2D_LIBS)
  
diff --git a/sci-libs/gerris/files/gerris-20131206-DEFAULT_SOURCE-replacement.patch b/sci-libs/gerris/files/gerris-20131206-DEFAULT_SOURCE-replacement.patch
new file mode 100644
index 000000000000..d20df635512c
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20131206-DEFAULT_SOURCE-replacement.patch
@@ -0,0 +1,16 @@
+Silence warnings due to _BSD_SOURCE being deprecated by glib:
+* /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and
+* _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
+* # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -108,7 +108,7 @@
+ AC_PROG_CC
+ 
+ # -D_GNU_SOURCE is only necessary for old (< 2.10) glibc implementations of open_memstream()
+-CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_GNU_SOURCE"
++CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_GNU_SOURCE"
+ if test x$GCC = xyes ; then
+   CFLAGS="$CFLAGS -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -Wmissing-declarations -pipe -std=c99"
+ fi
diff --git a/sci-libs/gerris/files/gerris-20131206-lis-api-change.patch b/sci-libs/gerris/files/gerris-20131206-lis-api-change.patch
new file mode 100644
index 000000000000..28892ddadedf
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20131206-lis-api-change.patch
@@ -0,0 +1,18 @@
+sci-libs/lis changed some of its function prototypes by renaming
+lis_solver_get_iters to lis_solver_get_iter in version 1.4.43 from 17 July 2014
+
+See also:
+http://www.ssisc.org/lis/ChangeLog.txt
+https://bugs.gentoo.org/show_bug.cgi?id=593282
+
+--- a/modules/lis.c
++++ b/modules/lis.c
+@@ -67,7 +67,7 @@
+ 
+   lis_solve (A, b, x, solver);
+   int iter;
+-  lis_solver_get_iters (solver, &iter);
++  lis_solver_get_iter (solver, &iter);
+   par->niter = iter;
+ 
+   lis_vector_get_values (x, 0, lp->lhs->len, (double *) lp->lhs->data);
diff --git a/sci-libs/gerris/gerris-20120731.ebuild b/sci-libs/gerris/gerris-20120731.ebuild
deleted file mode 100644
index 973040d29ba5..000000000000
--- a/sci-libs/gerris/gerris-20120731.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-MYP=${P/-20/-snapshot-}
-
-DESCRIPTION="Gerris Flow Solver"
-HOMEPAGE="http://gfs.sourceforge.net/"
-SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples mpi static-libs"
-
-# all these deps could be optional
-# but the configure.in would have to be modified
-# heavily for the automagic
-RDEPEND="
-	dev-libs/glib:2
-	dev-games/ode
-	sci-libs/netcdf
-	sci-libs/gsl
-	sci-libs/gts
-	sci-libs/hypre[mpi?]
-	sci-libs/lis[mpi?]
-	sci-libs/proj
-	>=sci-libs/fftw-3
-	virtual/lapack
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-# buggy tests, need extra packages and require gerris to be installed
-RESTRICT=test
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-hypre-no-mpi.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-I${EPREFIX}/usr/include/hypre"
-	econf \
-		$(use_enable mpi) \
-		$(use_enable static-libs static) \
-		LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-}
-
-src_install() {
-	default
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		rm -f doc/examples/*.pyc || die "Failed to remove python object"
-		doins -r doc/examples/*
-	fi
-}
diff --git a/sci-libs/gerris/gerris-20130531.ebuild b/sci-libs/gerris/gerris-20130531.ebuild
deleted file mode 100644
index 5aec888c6f71..000000000000
--- a/sci-libs/gerris/gerris-20130531.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils eutils flag-o-matic toolchain-funcs
-
-MYP=${P/-20/-snapshot-}
-
-DESCRIPTION="Gerris Flow Solver"
-HOMEPAGE="http://gfs.sourceforge.net/"
-SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples mpi static-libs"
-
-# all these deps could be optional
-# but the configure.in would have to be modified
-# heavily for the automagic
-RDEPEND="
-	dev-libs/glib:2
-	dev-games/ode
-	sci-libs/netcdf
-	sci-libs/gsl
-	sci-libs/gts
-	sci-libs/hypre[mpi?]
-	sci-libs/lis[mpi?]
-	sci-libs/proj
-	>=sci-libs/fftw-3
-	virtual/lapack
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-# buggy tests, need extra packages and require gerris to be installed
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hypre-no-mpi.patch
-	"${FILESDIR}"/${P}-lis-matrix-csr.patch
-	"${FILESDIR}"/${P}-use-blas-lapack-system.patch
-)
-
-src_configure() {
-	append-cppflags "-I${EPREFIX}/usr/include/hypre"
-	local myeconfargs=(
-		$(use_enable mpi)
-	)
-	autotools-utils_src_configure \
-		LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r doc/examples/*
-	fi
-}
diff --git a/sci-libs/gerris/gerris-20131206.ebuild b/sci-libs/gerris/gerris-20131206-r1.ebuild
similarity index 61%
rename from sci-libs/gerris/gerris-20131206.ebuild
rename to sci-libs/gerris/gerris-20131206-r1.ebuild
index 9dbad6db4d23..464ca8ab0de8 100644
--- a/sci-libs/gerris/gerris-20131206.ebuild
+++ b/sci-libs/gerris/gerris-20131206-r1.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools flag-o-matic toolchain-funcs
 
-inherit autotools-utils eutils flag-o-matic toolchain-funcs
-
-MYP=${P/-20/-snapshot-}
+MY_P=${P/-20/-snapshot-}
 
 DESCRIPTION="Gerris Flow Solver"
 HOMEPAGE="http://gfs.sourceforge.net/"
-SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MYP}.tar.gz"
+SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 
@@ -27,19 +24,19 @@ IUSE="examples mpi static-libs"
 RDEPEND="
 	dev-libs/glib:2
 	dev-games/ode
-	sci-libs/netcdf
-	sci-libs/gsl
+	sci-libs/netcdf:=
+	sci-libs/gsl:=
 	sci-libs/gts
 	sci-libs/hypre[mpi?]
 	sci-libs/lis[mpi?]
 	sci-libs/proj
-	>=sci-libs/fftw-3
+	sci-libs/fftw:3.0=
 	virtual/lapack
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${MYP}"
+S="${WORKDIR}/${MY_P}"
 
 # buggy tests, need extra packages and require gerris to be installed
 RESTRICT=test
@@ -48,21 +45,27 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-20130531-hypre-no-mpi.patch
 	"${FILESDIR}"/${PN}-20130531-lis-matrix-csr.patch
 	"${FILESDIR}"/${PN}-20130531-use-blas-lapack-system.patch
+	"${FILESDIR}"/${PN}-20131206-lis-api-change.patch
+	"${FILESDIR}"/${PN}-20131206-DEFAULT_SOURCE-replacement.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	append-cppflags "-I${EPREFIX}/usr/include/hypre"
-	local myeconfargs=(
-		$(use_enable mpi)
-	)
-	autotools-utils_src_configure \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable mpi) \
 		LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 }
 
 src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r doc/examples/*
-	fi
+	default
+	use examples && dodoc -r doc/examples
+
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/libcerf/libcerf-1.4.ebuild b/sci-libs/libcerf/libcerf-1.4.ebuild
index 654059a32a20..fee6cbc34563 100644
--- a/sci-libs/libcerf/libcerf-1.4.ebuild
+++ b/sci-libs/libcerf/libcerf-1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 src_install() {
diff --git a/sci-libs/lis/Manifest b/sci-libs/lis/Manifest
index 846fed1601ce..803c9b444688 100644
--- a/sci-libs/lis/Manifest
+++ b/sci-libs/lis/Manifest
@@ -1 +1 @@
-DIST lis-1.6.2.tar.gz 3129847 SHA256 c2db6d2717626073a00367ef76e7e0ef861fa509060e4932c3275b1708db60d2 SHA512 369f7cfd7e867df950881bd4e060ae9f8a70a8e13c94406b0a863af7f224260340b1dc6c8ae56dd1194afff93c1031c5901ee083823576f4271443caee381930 WHIRLPOOL b8f2565c22274c00da1e746b12e8ca9c8c6a0953f3eef6dd5dbd3d97f1cd79fc28286e58c1f061396eddc8ddc8b4e656a2fdce76f2a636df756da7e0def150c9
+DIST lis-1.6.5.tar.gz 3130045 SHA256 74f9f24308935c2de4f0d8f99d3e36fba4fcc8e40d98e5edb3a5bd47811b6ce3 SHA512 0cd2fc445c6464490f01def99960f33bbde53b45b453e289edbc9f31b7a20f00d70538bd3feb03324b56ddbc5993d8ba3bfbc8a0574809be08a854c05c097f13 WHIRLPOOL 7663a318aa631c1f15a19149e5cb2252a46ebc12c5936d38249de0010c2ae326afecfe24f5cc022c68e1f09d8c7a5f26db80903b4d4612d73b4c9a25ac087ac1
diff --git a/sci-libs/lis/lis-1.6.2.ebuild b/sci-libs/lis/lis-1.6.5.ebuild
similarity index 100%
rename from sci-libs/lis/lis-1.6.2.ebuild
rename to sci-libs/lis/lis-1.6.5.ebuild
diff --git a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch b/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch
deleted file mode 100644
index e74d123b6418..000000000000
--- a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -r 7f19e7f2afa2 lib/stddef.in.h
---- a/libgnu/stddef.in.h	Sat Feb 21 06:19:32 2015 -0800
-+++ b/libgnu/stddef.in.h	Fri May 01 06:01:06 2015 +0200
-@@ -82,6 +82,7 @@
- #endif
- 
- /* Some platforms lack max_align_t.  */
-+#ifndef _GCC_MAX_ALIGN_T
- #if !@HAVE_MAX_ALIGN_T@
- typedef union
- {
-@@ -91,6 +92,7 @@
-   long int __i;
- } max_align_t;
- #endif
-+#endif
- 
- #  endif /* _@GUARD_PREFIX@_STDDEF_H */
- # endif /* _@GUARD_PREFIX@_STDDEF_H */
diff --git a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5.patch b/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5.patch
deleted file mode 100644
index 31b1bed74e2d..000000000000
--- a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -r 3797df921988 configure.ac
---- a/configure.ac	Wed Apr 29 17:09:24 2015 -0700
-+++ b/configure.ac	Sun May 03 22:48:56 2015 +0200
-@@ -815,8 +815,13 @@
-       AC_MSG_NOTICE([using -isystem for LLVM headers])])
- 
-     dnl Use -isystem so we don't get warnings from llvm headers
--    LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
--    LLVM_CXXFLAGS=
-+    AX_CHECK_COMPILE_FLAG([-std=c++11],[
-+      LLVM_CPPFLAGS="-std=c++11 $LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
-+      LLVM_CXXFLAGS="-std=c++11"
-+    ],[
-+      LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
-+      LLVM_CXXFLAGS=
-+    ])
-     LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
- 
- 
-@@ -860,6 +865,8 @@
-     OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API
-     OCTAVE_LLVM_RAW_FD_OSTREAM_API
-     OCTAVE_LLVM_LEGACY_PASSMANAGER_API
-+    OCTAVE_LLVM_DATALAYOUTPASS_API
-+
-     AC_LANG_POP(C++)
-     CPPFLAGS="$save_CPPFLAGS"
-     CXXFLAGS="$save_CXXFLAGS"
-diff -r 3797df921988 libinterp/corefcn/jit-typeinfo.cc
---- a/libinterp/corefcn/jit-typeinfo.cc	Wed Apr 29 17:09:24 2015 -0700
-+++ b/libinterp/corefcn/jit-typeinfo.cc	Sun May 03 22:48:56 2015 +0200
-@@ -1208,7 +1208,7 @@
-   for (int op = 0; op < octave_value::num_binary_ops; ++op)
-     {
-       llvm::Twine fn_name ("octave_jit_binary_any_any_");
--      fn_name = fn_name + llvm::Twine (op);
-+      fn_name.concat( llvm::Twine (op) );
- 
-       fn = create_internal (fn_name, any, any, any);
-       fn.mark_can_error ();
-diff -r 3797df921988 libinterp/corefcn/pt-jit.cc
---- a/libinterp/corefcn/pt-jit.cc	Wed Apr 29 17:09:24 2015 -0700
-+++ b/libinterp/corefcn/pt-jit.cc	Sun May 03 22:48:56 2015 +0200
-@@ -59,6 +59,7 @@
- 
- #include <llvm/Bitcode/ReaderWriter.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
-+#include <llvm/ExecutionEngine/MCJIT.h>
- #include <llvm/ExecutionEngine/JIT.h>
- 
- #ifdef LEGACY_PASSMANAGER
-@@ -83,6 +84,7 @@
- #include <llvm/IRBuilder.h>
- #endif
- 
-+#include <llvm/Support/FileSystem.h>
- #include <llvm/Support/raw_os_ostream.h>
- #include <llvm/Support/TargetSelect.h>
- 
-@@ -2077,7 +2079,11 @@
-   module_pass_manager->add (llvm::createAlwaysInlinerPass ());
- 
- #ifdef HAVE_LLVM_DATALAYOUT
-+#ifdef HAVE_LLVM_DATALAYOUTPASS
-+  pass_manager->add (new llvm::DataLayoutPass (*engine->getDataLayout ()));
-+#else
-   pass_manager->add (new llvm::DataLayout (*engine->getDataLayout ()));
-+#endif
- #else
-   pass_manager->add (new llvm::TargetData (*engine->getTargetData ()));
- #endif
-@@ -2192,7 +2198,7 @@
-       std::string error;
- #ifdef RAW_FD_OSTREAM_ARG_IS_LLVM_SYS_FS
-       llvm::raw_fd_ostream fout ("test.bc", error,
--                                 llvm::sys::fs::F_Binary);
-+                                 llvm::sys::fs::F_Text);
- #else
-       llvm::raw_fd_ostream fout ("test.bc", error,
-                                  llvm::raw_fd_ostream::F_Binary);
-diff -r 3797df921988 m4/acinclude.m4
---- a/m4/acinclude.m4	Wed Apr 29 17:09:24 2015 -0700
-+++ b/m4/acinclude.m4	Sun May 03 22:48:56 2015 +0200
-@@ -1784,10 +1784,11 @@
-     [AC_LANG_PUSH(C++)
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([[
-+          #include <llvm/Support/FileSystem.h>
-           #include <llvm/Support/raw_os_ostream.h>
-           ]], [[
-           std::string str;
--          llvm::raw_fd_ostream fout ("", str, llvm::sys::fs::F_Binary);
-+          llvm::raw_fd_ostream fout ("", str, llvm::sys::fs::F_Text);
-         ]])],
-         octave_cv_raw_fd_ostream_arg_is_llvm_sys_fs=yes,
-         octave_cv_raw_fd_ostream_arg_is_llvm_sys_fs=no)
-@@ -1828,6 +1829,33 @@
-   fi
- ])
- dnl
-+dnl Check for llvm::DataLayoutPass API
-+dnl
-+AC_DEFUN([OCTAVE_LLVM_DATALAYOUTPASS_API], [
-+  AC_CACHE_CHECK([check for LLVM::DataLayoutPass],
-+    [octave_cv_datalayoutpass],
-+    [AC_LANG_PUSH(C++)
-+      save_LIBS="$LIBS"
-+      LIBS="$LLVM_LIBS $LIBS"
-+      AC_LINK_IFELSE(
-+        [AC_LANG_PROGRAM([[
-+          #include <llvm/IR/DataLayout.h>
-+          ]], [[
-+          llvm::Module *module;
-+          llvm::DataLayoutPass *datalayoutpass;
-+          datalayoutpass = new llvm::DataLayoutPass (module)
-+        ]])],
-+        octave_cv_datalayoutpass=yes,
-+        octave_cv_datalayoutpass=no)
-+      LIBS="$save_LIBS"
-+    AC_LANG_POP(C++)
-+  ])
-+  if test $octave_cv_datalayoutpass = yes; then
-+    AC_DEFINE(HAVE_LLVM_DATALAYOUTPASS, 1,
-+      [Define to 1 if LLVM::DataLayoutPass exists.])
-+  fi
-+])
-+dnl
- dnl Check for ar.
- dnl
- AC_DEFUN([OCTAVE_PROG_AR], [
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index a3ecac6b94b7..885c63396ee3 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
 		<flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>
 		<flag name="gui">Enable the graphical user interface</flag>
-		<flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
 		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
 		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
 		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 4aa4db278af2..52f52e87249c 100644
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -35,9 +35,6 @@ RDEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
-	jit? (
-		>=sys-devel/autoconf-archive-2015.02.04
-		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
@@ -89,12 +86,6 @@ src_prepare() {
 		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
 
-	# Octave fails to build with LLVM 3.5 https://savannah.gnu.org/bugs/?41061
-	use jit && \
-		has_version ">=sys-devel/llvm-3.5" && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
-
 	# Fix bug 501756
 	sed -i \
 		-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -121,10 +112,10 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		--disable-64
+		--disable-jit
 		$(use_enable doc docs)
 		$(use_enable java)
 		$(use_enable gui)
-		$(use_enable jit)
 		$(use_enable readline)
 		$(use_with curl)
 		$(use_with fftw fftw3)
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index a90d8000ce2a..d84666836f3b 100644
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -35,9 +35,6 @@ RDEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
-	jit? (
-		>=sys-devel/autoconf-archive-2015.02.04
-		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
@@ -89,12 +86,6 @@ src_prepare() {
 		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
 
-	# Octave fails to build with LLVM 3.5 https://savannah.gnu.org/bugs/?41061
-	use jit && \
-		has_version ">=sys-devel/llvm-3.5" && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
-
 	# Fix bug 501756
 	sed -i \
 		-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -116,10 +107,10 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		--disable-64
+		--disable-jit
 		$(use_enable doc docs)
 		$(use_enable java)
 		$(use_enable gui)
-		$(use_enable jit)
 		$(use_enable readline)
 		$(use_with curl)
 		$(use_with fftw fftw3)
diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 279abf2fb37d..666ac67e20b0 100644
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -35,9 +35,6 @@ RDEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
-	jit? (
-		>=sys-devel/autoconf-archive-2015.02.04
-		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
@@ -89,12 +86,6 @@ src_prepare() {
 		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
 
-	# Octave fails to build with LLVM 3.5 https://savannah.gnu.org/bugs/?41061
-	use jit && \
-		has_version ">=sys-devel/llvm-3.5" && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
-
 	# Fix bug 501756
 	sed -i \
 		-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -116,10 +107,10 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		--disable-64
+		--disable-jit
 		$(use_enable doc docs)
 		$(use_enable java)
 		$(use_enable gui)
-		$(use_enable jit)
 		$(use_enable readline)
 		$(use_with curl)
 		$(use_with fftw fftw3)
diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index a90d8000ce2a..d84666836f3b 100644
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -35,9 +35,6 @@ RDEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
-	jit? (
-		>=sys-devel/autoconf-archive-2015.02.04
-		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
@@ -89,12 +86,6 @@ src_prepare() {
 		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
 
-	# Octave fails to build with LLVM 3.5 https://savannah.gnu.org/bugs/?41061
-	use jit && \
-		has_version ">=sys-devel/llvm-3.5" && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
-
 	# Fix bug 501756
 	sed -i \
 		-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -116,10 +107,10 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		--disable-64
+		--disable-jit
 		$(use_enable doc docs)
 		$(use_enable java)
 		$(use_enable gui)
-		$(use_enable jit)
 		$(use_enable readline)
 		$(use_with curl)
 		$(use_with fftw fftw3)
diff --git a/sci-mathematics/octave/octave-4.0.2-r2.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
index 279abf2fb37d..666ac67e20b0 100644
--- a/sci-mathematics/octave/octave-4.0.2-r2.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -35,9 +35,6 @@ RDEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
-	jit? (
-		>=sys-devel/autoconf-archive-2015.02.04
-		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
@@ -89,12 +86,6 @@ src_prepare() {
 		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
 
-	# Octave fails to build with LLVM 3.5 https://savannah.gnu.org/bugs/?41061
-	use jit && \
-		has_version ">=sys-devel/llvm-3.5" && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
-
 	# Fix bug 501756
 	sed -i \
 		-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -116,10 +107,10 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 		--disable-64
+		--disable-jit
 		$(use_enable doc docs)
 		$(use_enable java)
 		$(use_enable gui)
-		$(use_enable jit)
 		$(use_enable readline)
 		$(use_with curl)
 		$(use_with fftw fftw3)
diff --git a/sci-mathematics/octave/octave-4.0.3.ebuild b/sci-mathematics/octave/octave-4.0.3.ebuild
index ef685a244927..117d91708c9a 100644
--- a/sci-mathematics/octave/octave-4.0.3.ebuild
+++ b/sci-mathematics/octave/octave-4.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -32,9 +32,6 @@ RDEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
-	jit? (
-		>=sys-devel/autoconf-archive-2015.02.04
-		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
@@ -87,12 +84,6 @@ src_prepare() {
 		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
 
-	# Octave fails to build with LLVM 3.5 https://savannah.gnu.org/bugs/?41061
-	use jit && has_version ">=sys-devel/llvm-3.5" && \
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch
-		)
-
 	# Fix bug 501756
 	sed -i \
 		-e 's@A-Za-z0-9@[:alnum:]@g' \
@@ -125,12 +116,12 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		--disable-64 \
+		--disable-jit \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable doc docs) \
 		$(use_enable java) \
 		$(use_enable gui) \
-		$(use_enable jit) \
 		$(use_enable readline) \
 		$(use_with curl) \
 		$(use_with fftw fftw3) \
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
index 4a986be8b858..f5e36982a28d 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild
@@ -18,11 +18,11 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
-	KEYWORDS="alpha arm"
+	KEYWORDS="alpha arm hppa ppc64"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	inherit autotools
 fi
 
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 0803f93eb620..4a7d7097323d 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1 +1,2 @@
 DIST dtc-1.4.1.tar.xz 107920 SHA256 77992ad8eac7b68f553d0ba58e5b51604ac803d126196c99e3ae38aaae28bb94 SHA512 63df730e65f62b8c9648cfee5461809188f4198cbf98de25fbe5cb7f2f43c405266abb740501740f59847dc6faf0588bcbc734d08ae5430b05c2601e070d6d05 WHIRLPOOL 93e9ed26024e4650bb2de6323ea639a3e52622aa3891a9f9404959b600d2c1cbc633d18e30d3629ac54ae662e8c58a7d0ca7910a9b323cd8dd4ff6e43a3fdf67
+DIST dtc-1.4.2.tar.xz 112480 SHA256 13456ee9840abbbcb956d0711c580d28524e2ee17840e556e744311f2d8afaac SHA512 af536fda543a2516e10c45b80bd1b5797a33ab43e08fab6953ec861fc98a73ee232cdd3f5053e889f6e760d238a5a221c2716b8a6fd22b627cd01efac99915b2 WHIRLPOOL 0cbb2d696aec8017d609073ceab110ded29688d68b91588e5e2d3e3fcf23aa4636a1d92c1fce58b39e848689d0408692871c2cc6de5997e66278e1d030a46f8e
diff --git a/sys-apps/dtc/dtc-1.4.2.ebuild b/sys-apps/dtc/dtc-1.4.2.ebuild
new file mode 100644
index 000000000000..e6db8eaf45b2
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.4.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="http://devicetree.org/Device_Tree_Compiler"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+DOCS="
+	Documentation/manual.txt
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
+		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
+		Makefile || die
+
+	tc-export AR CC
+	export V=1
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 43d0f35abda7..e6db8eaf45b2 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
+inherit multilib toolchain-funcs eutils
 
-inherit multilib toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -20,12 +20,17 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=""
-DEPEND="app-arch/xz-utils
+DEPEND="
+	sys-devel/bison
 	sys-devel/flex
-	sys-devel/bison"
+"
+DOCS="
+	Documentation/manual.txt
+"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e '/^CFLAGS =/s:=:+=:' \
 		-e '/^CPPFLAGS =/s:=:+=:' \
@@ -34,12 +39,13 @@ src_prepare() {
 		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
 		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
 		Makefile || die
+
 	tc-export AR CC
 	export V=1
 }
 
 src_install() {
 	default
+
 	use static-libs || find "${ED}" -name '*.a' -delete
-	dodoc Documentation/manual.txt
 }
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index ef9eb6530335..63997fd5a045 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,4 +1,4 @@
 DIST texinfo-4.13.tar.lzma 1563777 SHA256 6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5 SHA512 bded399ed5fcf97dfa72d9486df91ecfc501301d83929b09b230aee2b8ad6994b7d7b5965b04d43de729cee30575b2334cf75879ad0a61c4b781ccc16d6c12db WHIRLPOOL 6ef9d5e47cae7c6a94272e35bafe0716e617691b6b549a59ef8f95244f1b9a94e9adb79db38cf8e23166a43e84725e3eb01c971c8894bc4201aa743a44170c35
 DIST texinfo-5.2.tar.xz 3812944 SHA256 5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda SHA512 6f9c5142db3b155bd601149b5632807b3c20dcfa7006ce5f7e120e6fc4b2174a3f4671c18232c040ffd69ebfb5950be5c563ac5cc08b88d03eb5a9f1b0f96c04 WHIRLPOOL 609f0c2ac4deccf85f99cae3f681ce3892c7822988a84970171dec0f1224052861b3ac3fac97e666016bac4469b0e8446133c775a20f7201ff6dffa90fc84290
-DIST texinfo-6.0.tar.xz 4086712 SHA256 11ba4358696e8be3b3c7cfc88b89cf69525791aeabf0ee0a59ca58ebbd3471e4 SHA512 36f82288dfb7c2385630043faf75ccef5af625952d792c669c5eea673ae5b3474c148041bf1935f87ddeaae7114103731277e715d0d510c6fb41e0211ab12494 WHIRLPOOL 1d1facd5670321aca908407f65ff6a8769f3d7528c4535d77cf3fc6d948d766acc1e3f592e74554c427fca51a9e54048d54774586543d6316b664ac3c92d06c8
 DIST texinfo-6.1.tar.xz 4520376 SHA256 ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 SHA512 ae47295f3bcfb728c3be59421cf830ecfa5fc7856a086e45da2bac89600d883aa4406a6ef62d7ee5dc2bab83a3efa1cec861a3b4b14b85bbecb53ebf3ebf7235 WHIRLPOOL 187f11681f041aa5f4260c6c2833cb877a4c74afda73d4f72008c61c8a089dd0393ff90257410d5e48b9501c36dd4991032db001c5c17b8224afb6f5819cd165
+DIST texinfo-6.3.tar.xz 4468048 SHA256 246cf3ffa54985118ec2eea2b8d0c71b92114efe6282c2ae90d65029db4cf93a SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4 WHIRLPOOL 45cb684cd14fdfc5da1ec54cee017e0835334481df9f4db35c18b2837509b1d15ea590d90a925edf4febae59669e9dc8e6287838368e8730f714811e70dbd417
diff --git a/sys-apps/texinfo/texinfo-6.0.ebuild b/sys-apps/texinfo/texinfo-6.3.ebuild
similarity index 89%
rename from sys-apps/texinfo/texinfo-6.0.ebuild
rename to sys-apps/texinfo/texinfo-6.3.ebuild
index 2e2ddf0227c7..7cba6a70e8f5 100644
--- a/sys-apps/texinfo/texinfo-6.0.ebuild
+++ b/sys-apps/texinfo/texinfo-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ RDEPEND="
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
+	nls? ( >=sys-devel/gettext-0.19.6 )"
 
 src_configure() {
 	use static && append-ldflags -static
@@ -39,8 +39,3 @@ src_configure() {
 		--with-external-Text-Unidecode \
 		$(use_enable nls)
 }
-
-src_install() {
-	default
-	newdoc info/README README.info
-}
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 65225e1ef6b3..1983a1672c75 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -9,4 +9,4 @@ DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28
 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
 DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
 DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
-DIST unifont-9.0.01.pcf.gz 1360323 SHA256 9facd7efda3c960f67aff79db39912d8f1040f56e6c0e34b17dacc6b88737fd8 SHA512 23b6eac158825a02f4e1961b9277d6b1be68508c88abce60b3548f54b7cf8f9c86e26b8841fb59c650c17a5d22b3f5b401b222593fc78b0f8fe39d5ead2a6a18 WHIRLPOOL 709a0139a000b2bbe936153d6f69ba8f7b7b0be52fc202bf0224c9eebdcddacd8b568f36cec77d768c7b2cc5512aa945e3cf2c1971e32a6846139fa182e6b30d
+DIST unifont-9.0.02.pcf.gz 1360332 SHA256 c2f2a3d6a4e8420d4ed66778ca61836225ff68d6ef031aad6842f4d02914961f SHA512 f619d6a23217d28399b1cf842077891af6749eb611b1c6e3bb9fce94a918834c6a73d423dafe9b5d36661ac7fd2c0aa4ef3c483f449fed48f4d09ae55359073b WHIRLPOOL 2323c2a3bea1eaeeb4c31d921114b9dc5f974a21f73465b7e6b2bb5e1f0b1a84767e1e638e36f6260395c9d3382d66cc631b7e75f72e7833eb168d5d07dcb363
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index faa6cecd607c..829968158f4b 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -36,7 +36,7 @@ PATCHES=(
 )
 
 DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.01
+UNIFONT=unifont-9.0.02
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
 	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
 
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 63ced0cb061c..bfde592ed96f 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,4 +1,3 @@
-DIST cinder-8.0.0.tar.gz 3955244 SHA256 bd05f3c0b7b2ae098284c062d20230aecdaa47ed623cb79907c39dd1e28f8a2e SHA512 5c6ec1dc172036068016373e2d30e55c88f07dae12438fcfe207caea2965360f0c7df5aff1a901c6e2442ebf0dbd56f0428e3f24651f6cdd682bb659f636b20c WHIRLPOOL 3bcd4477b7fd65b45dc305198fa8462e5c3bfffbdf75170607facdb446308aa9301a609090b4b43968369bf737b851d73a31af9b63752522b960850b3b6c0845
 DIST cinder-8.1.0.tar.gz 3860875 SHA256 f2bd093ee6ed56b10a694e198eb2b3b436340b492d2bb1c6ae85eba5ef1e0326 SHA512 df6be20bfa90c6b1603125986e9b1b90f9f5e86b07a72acf52f53bd68adbc6971b5b9b88b70a312647d8306480ef55eade8cbe747d27646b302f886972631abb WHIRLPOOL 3516447f85bd2cecb907931d0c3eb0c379f2246c97be94b80549d01da68830d82d0dfe5967b153a287e98ee3a833c6d27491f5e3cb21a989bec490117c3b1b75
 DIST mitaka-cinder-api-paste.ini 2416 SHA256 3794a5e34dace60474274e93a7346662eb03a485d1b9b67afded591e764aba9d SHA512 f6e3800557fa7efb562a69f80eea9b516c0ad2e54b9a013c92118bf91daaf2bdd2a9ced309626fab13fe9b979f0c768ac22bba63c7fa8aa3443004d50359d844 WHIRLPOOL 90e8c7bf065609e6a85d247c15b1022ea51bb94b000841c30a69d99c96082a08125fca58cf5b216990c6b746f52af5cedebbafc5b9450a91c0d32cdc21951952
 DIST mitaka-cinder-policy.json 4959 SHA256 5a9cd9d5d4cf80a9271fd7a5146d6d5415d10f8d699a8499a39a3cde29f50bd6 SHA512 b36daa51ab7719e1a56ca760e7ec62a98fb3a88ffed96196852023abf4ffe483200c9dcb934e3c7910fc6988f9c2bb9bb914121d0d649dc3b01466f467a82fe2 WHIRLPOOL f288b6dba2593fa6deb8ad94862948899ec10f71e4751f108ec1fbfff814c3206b5c541aaac0bb7edd2fb5311639a1cd3a44586855912cb2e0e675d5ad78161c
diff --git a/sys-cluster/cinder/cinder-8.0.0.ebuild b/sys-cluster/cinder/cinder-8.0.0.ebuild
deleted file mode 100644
index ae2349b515d8..000000000000
--- a/sys-cluster/cinder/cinder-8.0.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/cinder.conf.sample -> mitaka-cinder.conf.sample
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/api-paste.ini -> mitaka-cinder-api-paste.ini
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/policy.json -> mitaka-cinder-policy.json
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/volume.filters -> mitaka-cinder-volume.filters"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	iscsi? (
-		sys-block/tgt
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini"
-	newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-8.1.0.ebuild b/sys-cluster/cinder/cinder-8.1.0.ebuild
index 52e541f3e4bf..6f7138cd1996 100644
--- a/sys-cluster/cinder/cinder-8.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-8.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
new file mode 100644
index 000000000000..140e3461c1f8
--- /dev/null
+++ b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools toolchain-funcs multilib
+
+MY_P="${PN^^[gasn]}-${PV}"
+DESCRIPTION="Networking middleware for partitioned global address space (PGAS) language"
+HOMEPAGE="http://gasnet.lbl.gov/"
+SRC_URI="http://gasnet.lbl.gov/${MY_P}.tar.gz"
+
+SOVER="${PV%%.*}"
+LICENSE="BSD"
+SLOT="0/${SOVER}"
+KEYWORDS="~amd64"
+IUSE="mpi static-libs threads"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+static_to_shared() {
+	local libstatic="${1}"; shift
+	local libname="${libstatic%.a}"
+	libname="${libname##*/}"
+	local soname="${libname}$(get_libname ${SOVER})"
+	local libdir="${libstatic%/*}"
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	find . \
+		\( -name Makefile.am -or -name "*.mak" \) \
+		-exec sed -i '/^docdir/s/^/#/' {} + || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable mpi) \
+		$(use_enable threads pthreads) \
+		CC="$(tc-getCC) ${CFLAGS} -fPIC" \
+		MPI_CC="mpicc ${CFLAGS} -fPIC" \
+		CXX="$(tc-getCXX) ${CFLAGS} -fPIC"
+}
+
+src_install() {
+	local l libs
+	default
+	for l in "${ED}/usr/$(get_libdir)"/*.a; do
+		libs=
+		[[ $l = *mpi* ]] && libs+=" -lmpi"
+		static_to_shared "${l}" ${libs}
+	done
+	use static-libs || rm -f "${ED}/usr/$(get_libdir)"/*.a || die
+}
diff --git a/sys-cluster/legion/legion-16.08.0.ebuild b/sys-cluster/legion/legion-16.08.0-r1.ebuild
similarity index 91%
rename from sys-cluster/legion/legion-16.08.0.ebuild
rename to sys-cluster/legion/legion-16.08.0-r1.ebuild
index 534945d1aed2..8a4a9b2c23b6 100644
--- a/sys-cluster/legion/legion-16.08.0.ebuild
+++ b/sys-cluster/legion/legion-16.08.0-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 IUSE="gasnet +hwloc"
 
 DEPEND="
-	gasnet? ( sys-cluster/gasnet )
+	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
 	hwloc? ( sys-apps/hwloc )
 	"
 
@@ -30,6 +30,7 @@ src_configure() {
 	mycmakeargs=(
 		-DLegion_USE_HWLOC=$(usex hwloc)
 		-DLegion_USE_GASNet=$(usex gasnet)
+		-DBUILD_SHARED_LIBS=ON
 		-DLIB=$(get_libdir)
 	)
 	cmake-utils_src_configure
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 84dc4975537f..30cb67ee070e 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,3 +1,2 @@
 DIST mitaka-nova.conf.sample 36427 SHA256 dd4c3ccab89fbe9f69df520f47d439c7ffa440d3f8b288b0ab99ac328a02ec75 SHA512 169671bde5cb5bb89065d801f80aa0d3c664af652d9ddb0c409ed3e0af2c0b94f1dbd0ebf834849e3e75dc38972935ec65a6e533d86148a7315839597d577cad WHIRLPOOL 20f95a296c3d112a532c9c5cc911d30b67472868d94bcfd52fadfd7105f9095a6b77020ca1caa6a70319548239358868d809feed363a82e4d574aceb6e5f016d
-DIST nova-13.1.0.tar.gz 5461429 SHA256 2c44b0f015f48348d768abff0e0fc90c6f8faf46743cae94736d77704f249368 SHA512 f16ce0248b86a19688500b97c364fe264919a900f0182f68c900a8e68b06bb22d688be597d5b3d7e8e38753cedaa732360972412508f3ecfea950394a526c6c5 WHIRLPOOL f5d46a1166524d5ad79574f5f63ecc99a6a42865d2280d33a66103d2a88fb26e9c54c8a9ec85901970effd1aed89c42e33ce70a7e900cf642b9c90bfdc4bc52d
 DIST nova-13.1.1.tar.gz 5407219 SHA256 1af74830f52deb24ca0f25acf150c2338a414ccd2082bbb31092d55d28a92a9d SHA512 18866a1fb9e1e94b91b27d72318401de755255be3b3fd374f156ccf88c84697a8f54b6f5be17842f55b5ff323f19d778213925dbeb4ae9c02225d2b3fb56b3cc WHIRLPOOL d5bd05f773b49cf309f02ea34c7d5cbbd82078a17a7aadc66ebd1ed9dd8180a036f31d74d27ea6f1af644eaa873e0e955a52b44ee66448ea93e0507561055d50
diff --git a/sys-cluster/nova/files/etc.liberty/api-paste.ini b/sys-cluster/nova/files/etc.liberty/api-paste.ini
deleted file mode 100644
index cb5ea6713ab0..000000000000
--- a/sys-cluster/nova/files/etc.liberty/api-paste.ini
+++ /dev/null
@@ -1,140 +0,0 @@
-############
-# Metadata #
-############
-[composite:metadata]
-use = egg:Paste#urlmap
-/: meta
-
-[pipeline:meta]
-pipeline = ec2faultwrap logrequest metaapp
-
-[app:metaapp]
-paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
-
-#######
-# EC2 #
-#######
-
-# NOTE: this is now deprecated in favor of https://github.com/stackforge/ec2-api
-[composite:ec2]
-use = egg:Paste#urlmap
-/: ec2cloud
-
-[composite:ec2cloud]
-use = call:nova.api.auth:pipeline_factory
-noauth2 = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
-keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor
-
-[filter:ec2faultwrap]
-paste.filter_factory = nova.api.ec2:FaultWrapper.factory
-
-[filter:logrequest]
-paste.filter_factory = nova.api.ec2:RequestLogging.factory
-
-[filter:ec2lockout]
-paste.filter_factory = nova.api.ec2:Lockout.factory
-
-[filter:ec2keystoneauth]
-paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory
-
-[filter:ec2noauth]
-paste.filter_factory = nova.api.ec2:NoAuth.factory
-
-[filter:cloudrequest]
-controller = nova.api.ec2.cloud.CloudController
-paste.filter_factory = nova.api.ec2:Requestify.factory
-
-[filter:authorizer]
-paste.filter_factory = nova.api.ec2:Authorizer.factory
-
-[filter:validator]
-paste.filter_factory = nova.api.ec2:Validator.factory
-
-[app:ec2executor]
-paste.app_factory = nova.api.ec2:Executor.factory
-
-#############
-# OpenStack #
-#############
-
-[composite:osapi_compute]
-use = call:nova.api.openstack.urlmap:urlmap_factory
-/: oscomputeversions
-# starting in Liberty the v21 implementation replaces the v2
-# implementation and is suggested that you use it as the default. If
-# this causes issues with your clients you can rollback to the
-# *frozen* v2 api by commenting out the above stanza and using the
-# following instead::
-# /v1.1: openstack_compute_api_legacy_v2
-# /v2: openstack_compute_api_legacy_v2
-# if rolling back to v2 fixes your issue please file a critical bug
-# at - https://bugs.launchpad.net/nova/+bugs
-#
-# v21 is an exactly feature match for v2, except it has more stringent
-# input validation on the wsgi surface (prevents fuzzing early on the
-# API). It also provides new features via API microversions which are
-# opt into for clients. Unaware clients will receive the same frozen
-# v2 API feature set, but with some relaxed validation
-/v1.1: openstack_compute_api_v21_legacy_v2_compatible
-/v2: openstack_compute_api_v21_legacy_v2_compatible
-/v2.1: openstack_compute_api_v21
-
-# NOTE: this is deprecated in favor of openstack_compute_api_v21_legacy_v2_compatible
-[composite:openstack_compute_api_legacy_v2]
-use = call:nova.api.auth:pipeline_factory
-noauth2 = compute_req_id faultwrap sizelimit noauth2 legacy_ratelimit osapi_compute_app_legacy_v2
-keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_ratelimit osapi_compute_app_legacy_v2
-keystone_nolimit = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_legacy_v2
-
-[composite:openstack_compute_api_v21]
-use = call:nova.api.auth:pipeline_factory_v21
-noauth2 = compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21
-keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v21
-
-[composite:openstack_compute_api_v21_legacy_v2_compatible]
-use = call:nova.api.auth:pipeline_factory_v21
-noauth2 = compute_req_id faultwrap sizelimit noauth2 legacy_v2_compatible osapi_compute_app_v21
-keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext legacy_v2_compatible osapi_compute_app_v21
-
-[filter:request_id]
-paste.filter_factory = oslo_middleware:RequestId.factory
-
-[filter:compute_req_id]
-paste.filter_factory = nova.api.compute_req_id:ComputeReqIdMiddleware.factory
-
-[filter:faultwrap]
-paste.filter_factory = nova.api.openstack:FaultWrapper.factory
-
-[filter:noauth2]
-paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
-
-[filter:legacy_ratelimit]
-paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
-
-[filter:sizelimit]
-paste.filter_factory = oslo_middleware:RequestBodySizeLimiter.factory
-
-[filter:legacy_v2_compatible]
-paste.filter_factory = nova.api.openstack:LegacyV2CompatibleWrapper.factory
-
-[app:osapi_compute_app_legacy_v2]
-paste.app_factory = nova.api.openstack.compute:APIRouter.factory
-
-[app:osapi_compute_app_v21]
-paste.app_factory = nova.api.openstack.compute:APIRouterV21.factory
-
-[pipeline:oscomputeversions]
-pipeline = faultwrap oscomputeversionapp
-
-[app:oscomputeversionapp]
-paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
-
-##########
-# Shared #
-##########
-
-[filter:keystonecontext]
-paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
diff --git a/sys-cluster/nova/files/etc.liberty/cells.json b/sys-cluster/nova/files/etc.liberty/cells.json
deleted file mode 100644
index cc74930d4d7a..000000000000
--- a/sys-cluster/nova/files/etc.liberty/cells.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "parent": {
-        "name": "parent",
-        "api_url": "http://api.example.com:8774",
-        "transport_url": "rabbit://rabbit.example.com",
-        "weight_offset": 0.0,
-        "weight_scale": 1.0,
-        "is_parent": true
-    },
-    "cell1": {
-        "name": "cell1",
-        "api_url": "http://api.example.com:8774",
-        "transport_url": "rabbit://rabbit1.example.com",
-        "weight_offset": 0.0,
-        "weight_scale": 1.0,
-        "is_parent": false
-    },
-    "cell2": {
-        "name": "cell2",
-        "api_url": "http://api.example.com:8774",
-        "transport_url": "rabbit://rabbit2.example.com",
-        "weight_offset": 0.0,
-        "weight_scale": 1.0,
-        "is_parent": false
-    }
-}
diff --git a/sys-cluster/nova/files/etc.liberty/logging_sample.conf b/sys-cluster/nova/files/etc.liberty/logging_sample.conf
deleted file mode 100644
index 03c6944fcbb6..000000000000
--- a/sys-cluster/nova/files/etc.liberty/logging_sample.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-[loggers]
-keys = root, nova
-
-[handlers]
-keys = stderr, stdout, watchedfile, syslog, null
-
-[formatters]
-keys = context, default
-
-[logger_root]
-level = WARNING
-handlers = null
-
-[logger_nova]
-level = INFO
-handlers = stderr
-qualname = nova
-
-[logger_amqp]
-level = WARNING
-handlers = stderr
-qualname = amqp
-
-[logger_amqplib]
-level = WARNING
-handlers = stderr
-qualname = amqplib
-
-[logger_sqlalchemy]
-level = WARNING
-handlers = stderr
-qualname = sqlalchemy
-# "level = INFO" logs SQL queries.
-# "level = DEBUG" logs SQL queries and results.
-# "level = WARNING" logs neither.  (Recommended for production systems.)
-
-[logger_boto]
-level = WARNING
-handlers = stderr
-qualname = boto
-
-# NOTE(mikal): suds is used by the vmware driver, removing this will
-# cause many extraneous log lines for their tempest runs. Refer to
-# https://review.openstack.org/#/c/219225/ for details.
-[logger_suds]
-level = INFO
-handlers = stderr
-qualname = suds
-
-[logger_eventletwsgi]
-level = WARNING
-handlers = stderr
-qualname = eventlet.wsgi.server
-
-[handler_stderr]
-class = StreamHandler
-args = (sys.stderr,)
-formatter = context
-
-[handler_stdout]
-class = StreamHandler
-args = (sys.stdout,)
-formatter = context
-
-[handler_watchedfile]
-class = handlers.WatchedFileHandler
-args = ('nova.log',)
-formatter = context
-
-[handler_syslog]
-class = handlers.SysLogHandler
-args = ('/dev/log', handlers.SysLogHandler.LOG_USER)
-formatter = context
-
-[handler_null]
-class = logging.NullHandler
-formatter = default
-args = ()
-
-[formatter_context]
-class = nova.openstack.common.log.ContextFormatter
-
-[formatter_default]
-format = %(message)s
diff --git a/sys-cluster/nova/files/etc.liberty/policy.json b/sys-cluster/nova/files/etc.liberty/policy.json
deleted file mode 100644
index 5f6023e5c388..000000000000
--- a/sys-cluster/nova/files/etc.liberty/policy.json
+++ /dev/null
@@ -1,488 +0,0 @@
-{
-    "context_is_admin":  "role:admin",
-    "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
-    "default": "rule:admin_or_owner",
-
-    "cells_scheduler_filter:TargetCellFilter": "is_admin:True",
-
-    "compute:create": "",
-    "compute:create:attach_network": "",
-    "compute:create:attach_volume": "",
-    "compute:create:forced_host": "is_admin:True",
-
-    "compute:get": "",
-    "compute:get_all": "",
-    "compute:get_all_tenants": "is_admin:True",
-
-    "compute:update": "",
-
-    "compute:get_instance_metadata": "",
-    "compute:get_all_instance_metadata": "",
-    "compute:get_all_instance_system_metadata": "",
-    "compute:update_instance_metadata": "",
-    "compute:delete_instance_metadata": "",
-
-    "compute:get_instance_faults": "",
-    "compute:get_diagnostics": "",
-    "compute:get_instance_diagnostics": "",
-
-    "compute:start": "rule:admin_or_owner",
-    "compute:stop": "rule:admin_or_owner",
-
-    "compute:get_lock": "",
-    "compute:lock": "",
-    "compute:unlock": "",
-    "compute:unlock_override": "rule:admin_api",
-
-    "compute:get_vnc_console": "",
-    "compute:get_spice_console": "",
-    "compute:get_rdp_console": "",
-    "compute:get_serial_console": "",
-    "compute:get_mks_console": "",
-    "compute:get_console_output": "",
-
-    "compute:reset_network": "",
-    "compute:inject_network_info": "",
-    "compute:add_fixed_ip": "",
-    "compute:remove_fixed_ip": "",
-
-    "compute:attach_volume": "",
-    "compute:detach_volume": "",
-    "compute:swap_volume": "",
-
-    "compute:attach_interface": "",
-    "compute:detach_interface": "",
-
-    "compute:set_admin_password": "",
-
-    "compute:rescue": "",
-    "compute:unrescue": "",
-
-    "compute:suspend": "",
-    "compute:resume": "",
-
-    "compute:pause": "",
-    "compute:unpause": "",
-
-    "compute:shelve": "",
-    "compute:shelve_offload": "",
-    "compute:unshelve": "",
-
-    "compute:snapshot": "",
-    "compute:snapshot_volume_backed": "",
-    "compute:backup": "",
-
-    "compute:resize": "",
-    "compute:confirm_resize": "",
-    "compute:revert_resize": "",
-
-    "compute:rebuild": "",
-    "compute:reboot": "",
-    "compute:delete": "rule:admin_or_owner",
-    "compute:soft_delete": "rule:admin_or_owner",
-    "compute:force_delete": "rule:admin_or_owner",
-
-    "compute:security_groups:add_to_instance": "",
-    "compute:security_groups:remove_from_instance": "",
-
-    "compute:delete": "",
-    "compute:soft_delete": "",
-    "compute:force_delete": "",
-    "compute:restore": "",
-
-    "compute:volume_snapshot_create": "",
-    "compute:volume_snapshot_delete": "",
-
-    "admin_api": "is_admin:True",
-    "compute_extension:accounts": "rule:admin_api",
-    "compute_extension:admin_actions": "rule:admin_api",
-    "compute_extension:admin_actions:pause": "rule:admin_or_owner",
-    "compute_extension:admin_actions:unpause": "rule:admin_or_owner",
-    "compute_extension:admin_actions:suspend": "rule:admin_or_owner",
-    "compute_extension:admin_actions:resume": "rule:admin_or_owner",
-    "compute_extension:admin_actions:lock": "rule:admin_or_owner",
-    "compute_extension:admin_actions:unlock": "rule:admin_or_owner",
-    "compute_extension:admin_actions:resetNetwork": "rule:admin_api",
-    "compute_extension:admin_actions:injectNetworkInfo": "rule:admin_api",
-    "compute_extension:admin_actions:createBackup": "rule:admin_or_owner",
-    "compute_extension:admin_actions:migrateLive": "rule:admin_api",
-    "compute_extension:admin_actions:resetState": "rule:admin_api",
-    "compute_extension:admin_actions:migrate": "rule:admin_api",
-    "compute_extension:aggregates": "rule:admin_api",
-    "compute_extension:agents": "rule:admin_api",
-    "compute_extension:attach_interfaces": "",
-    "compute_extension:baremetal_nodes": "rule:admin_api",
-    "compute_extension:cells": "rule:admin_api",
-    "compute_extension:cells:create": "rule:admin_api",
-    "compute_extension:cells:delete": "rule:admin_api",
-    "compute_extension:cells:update": "rule:admin_api",
-    "compute_extension:cells:sync_instances": "rule:admin_api",
-    "compute_extension:certificates": "",
-    "compute_extension:cloudpipe": "rule:admin_api",
-    "compute_extension:cloudpipe_update": "rule:admin_api",
-    "compute_extension:config_drive": "",
-    "compute_extension:console_output": "",
-    "compute_extension:consoles": "",
-    "compute_extension:createserverext": "",
-    "compute_extension:deferred_delete": "",
-    "compute_extension:disk_config": "",
-    "compute_extension:evacuate": "rule:admin_api",
-    "compute_extension:extended_server_attributes": "rule:admin_api",
-    "compute_extension:extended_status": "",
-    "compute_extension:extended_availability_zone": "",
-    "compute_extension:extended_ips": "",
-    "compute_extension:extended_ips_mac": "",
-    "compute_extension:extended_vif_net": "",
-    "compute_extension:extended_volumes": "",
-    "compute_extension:fixed_ips": "rule:admin_api",
-    "compute_extension:flavor_access": "",
-    "compute_extension:flavor_access:addTenantAccess": "rule:admin_api",
-    "compute_extension:flavor_access:removeTenantAccess": "rule:admin_api",
-    "compute_extension:flavor_disabled": "",
-    "compute_extension:flavor_rxtx": "",
-    "compute_extension:flavor_swap": "",
-    "compute_extension:flavorextradata": "",
-    "compute_extension:flavorextraspecs:index": "",
-    "compute_extension:flavorextraspecs:show": "",
-    "compute_extension:flavorextraspecs:create": "rule:admin_api",
-    "compute_extension:flavorextraspecs:update": "rule:admin_api",
-    "compute_extension:flavorextraspecs:delete": "rule:admin_api",
-    "compute_extension:flavormanage": "rule:admin_api",
-    "compute_extension:floating_ip_dns": "",
-    "compute_extension:floating_ip_pools": "",
-    "compute_extension:floating_ips": "",
-    "compute_extension:floating_ips_bulk": "rule:admin_api",
-    "compute_extension:fping": "",
-    "compute_extension:fping:all_tenants": "rule:admin_api",
-    "compute_extension:hide_server_addresses": "is_admin:False",
-    "compute_extension:hosts": "rule:admin_api",
-    "compute_extension:hypervisors": "rule:admin_api",
-    "compute_extension:image_size": "",
-    "compute_extension:instance_actions": "",
-    "compute_extension:instance_actions:events": "rule:admin_api",
-    "compute_extension:instance_usage_audit_log": "rule:admin_api",
-    "compute_extension:keypairs": "",
-    "compute_extension:keypairs:index": "",
-    "compute_extension:keypairs:show": "",
-    "compute_extension:keypairs:create": "",
-    "compute_extension:keypairs:delete": "",
-    "compute_extension:multinic": "",
-    "compute_extension:networks": "rule:admin_api",
-    "compute_extension:networks:view": "",
-    "compute_extension:networks_associate": "rule:admin_api",
-    "compute_extension:os-tenant-networks": "",
-    "compute_extension:quotas:show": "",
-    "compute_extension:quotas:update": "rule:admin_api",
-    "compute_extension:quotas:delete": "rule:admin_api",
-    "compute_extension:quota_classes": "",
-    "compute_extension:rescue": "",
-    "compute_extension:security_group_default_rules": "rule:admin_api",
-    "compute_extension:security_groups": "",
-    "compute_extension:server_diagnostics": "rule:admin_api",
-    "compute_extension:server_groups": "",
-    "compute_extension:server_password": "",
-    "compute_extension:server_usage": "",
-    "compute_extension:services": "rule:admin_api",
-    "compute_extension:shelve": "",
-    "compute_extension:shelveOffload": "rule:admin_api",
-    "compute_extension:simple_tenant_usage:show": "rule:admin_or_owner",
-    "compute_extension:simple_tenant_usage:list": "rule:admin_api",
-    "compute_extension:unshelve": "",
-    "compute_extension:users": "rule:admin_api",
-    "compute_extension:virtual_interfaces": "",
-    "compute_extension:virtual_storage_arrays": "",
-    "compute_extension:volumes": "",
-    "compute_extension:volume_attachments:index": "",
-    "compute_extension:volume_attachments:show": "",
-    "compute_extension:volume_attachments:create": "",
-    "compute_extension:volume_attachments:update": "",
-    "compute_extension:volume_attachments:delete": "",
-    "compute_extension:volumetypes": "",
-    "compute_extension:availability_zone:list": "",
-    "compute_extension:availability_zone:detail": "rule:admin_api",
-    "compute_extension:used_limits_for_admin": "rule:admin_api",
-    "compute_extension:migrations:index": "rule:admin_api",
-    "compute_extension:os-assisted-volume-snapshots:create": "rule:admin_api",
-    "compute_extension:os-assisted-volume-snapshots:delete": "rule:admin_api",
-    "compute_extension:console_auth_tokens": "rule:admin_api",
-    "compute_extension:os-server-external-events:create": "rule:admin_api",
-
-    "network:get_all": "",
-    "network:get": "",
-    "network:create": "",
-    "network:delete": "",
-    "network:associate": "",
-    "network:disassociate": "",
-    "network:get_vifs_by_instance": "",
-    "network:allocate_for_instance": "",
-    "network:deallocate_for_instance": "",
-    "network:validate_networks": "",
-    "network:get_instance_uuids_by_ip_filter": "",
-    "network:get_instance_id_by_floating_address": "",
-    "network:setup_networks_on_host": "",
-    "network:get_backdoor_port": "",
-
-    "network:get_floating_ip": "",
-    "network:get_floating_ip_pools": "",
-    "network:get_floating_ip_by_address": "",
-    "network:get_floating_ips_by_project": "",
-    "network:get_floating_ips_by_fixed_address": "",
-    "network:allocate_floating_ip": "",
-    "network:associate_floating_ip": "",
-    "network:disassociate_floating_ip": "",
-    "network:release_floating_ip": "",
-    "network:migrate_instance_start": "",
-    "network:migrate_instance_finish": "",
-
-    "network:get_fixed_ip": "",
-    "network:get_fixed_ip_by_address": "",
-    "network:add_fixed_ip_to_instance": "",
-    "network:remove_fixed_ip_from_instance": "",
-    "network:add_network_to_project": "",
-    "network:get_instance_nw_info": "",
-
-    "network:get_dns_domains": "",
-    "network:add_dns_entry": "",
-    "network:modify_dns_entry": "",
-    "network:delete_dns_entry": "",
-    "network:get_dns_entries_by_address": "",
-    "network:get_dns_entries_by_name": "",
-    "network:create_private_dns_domain": "",
-    "network:create_public_dns_domain": "",
-    "network:delete_dns_domain": "",
-    "network:attach_external_network": "rule:admin_api",
-    "network:get_vif_by_mac_address": "",
-
-    "os_compute_api:servers:detail:get_all_tenants": "is_admin:True",
-    "os_compute_api:servers:index:get_all_tenants": "is_admin:True",
-    "os_compute_api:servers:confirm_resize": "",
-    "os_compute_api:servers:create": "",
-    "os_compute_api:servers:create:attach_network": "",
-    "os_compute_api:servers:create:attach_volume": "",
-    "os_compute_api:servers:create:forced_host": "rule:admin_api",
-    "os_compute_api:servers:delete": "",
-    "os_compute_api:servers:update": "",
-    "os_compute_api:servers:detail": "",
-    "os_compute_api:servers:index": "",
-    "os_compute_api:servers:reboot": "",
-    "os_compute_api:servers:rebuild": "",
-    "os_compute_api:servers:resize": "",
-    "os_compute_api:servers:revert_resize": "",
-    "os_compute_api:servers:show": "",
-    "os_compute_api:servers:create_image": "",
-    "os_compute_api:servers:create_image:allow_volume_backed": "",
-    "os_compute_api:servers:start": "rule:admin_or_owner",
-    "os_compute_api:servers:stop": "rule:admin_or_owner",
-    "os_compute_api:os-access-ips:discoverable": "",
-    "os_compute_api:os-access-ips": "",
-    "os_compute_api:os-admin-actions": "rule:admin_api",
-    "os_compute_api:os-admin-actions:discoverable": "",
-    "os_compute_api:os-admin-actions:reset_network": "rule:admin_api",
-    "os_compute_api:os-admin-actions:inject_network_info": "rule:admin_api",
-    "os_compute_api:os-admin-actions:reset_state": "rule:admin_api",
-    "os_compute_api:os-admin-password": "",
-    "os_compute_api:os-admin-password:discoverable": "",
-    "os_compute_api:os-aggregates:discoverable": "",
-    "os_compute_api:os-aggregates:index": "rule:admin_api",
-    "os_compute_api:os-aggregates:create": "rule:admin_api",
-    "os_compute_api:os-aggregates:show": "rule:admin_api",
-    "os_compute_api:os-aggregates:update": "rule:admin_api",
-    "os_compute_api:os-aggregates:delete": "rule:admin_api",
-    "os_compute_api:os-aggregates:add_host": "rule:admin_api",
-    "os_compute_api:os-aggregates:remove_host": "rule:admin_api",
-    "os_compute_api:os-aggregates:set_metadata": "rule:admin_api",
-    "os_compute_api:os-agents": "rule:admin_api",
-    "os_compute_api:os-agents:discoverable": "",
-    "os_compute_api:os-attach-interfaces": "",
-    "os_compute_api:os-attach-interfaces:discoverable": "",
-    "os_compute_api:os-baremetal-nodes": "rule:admin_api",
-    "os_compute_api:os-baremetal-nodes:discoverable": "",
-    "os_compute_api:os-block-device-mapping-v1:discoverable": "",
-    "os_compute_api:os-cells": "rule:admin_api",
-    "os_compute_api:os-cells:create": "rule:admin_api",
-    "os_compute_api:os-cells:delete": "rule:admin_api",
-    "os_compute_api:os-cells:update": "rule:admin_api",
-    "os_compute_api:os-cells:sync_instances": "rule:admin_api",
-    "os_compute_api:os-cells:discoverable": "",
-    "os_compute_api:os-certificates:create": "",
-    "os_compute_api:os-certificates:show": "",
-    "os_compute_api:os-certificates:discoverable": "",
-    "os_compute_api:os-cloudpipe": "rule:admin_api",
-    "os_compute_api:os-cloudpipe:discoverable": "",
-    "os_compute_api:os-config-drive": "",
-    "os_compute_api:os-consoles:discoverable": "",
-    "os_compute_api:os-consoles:create": "",
-    "os_compute_api:os-consoles:delete": "",
-    "os_compute_api:os-consoles:index": "",
-    "os_compute_api:os-consoles:show": "",
-    "os_compute_api:os-console-output:discoverable": "",
-    "os_compute_api:os-console-output": "",
-    "os_compute_api:os-remote-consoles": "",
-    "os_compute_api:os-remote-consoles:discoverable": "",
-    "os_compute_api:os-create-backup:discoverable": "",
-    "os_compute_api:os-create-backup": "rule:admin_or_owner",
-    "os_compute_api:os-deferred-delete": "",
-    "os_compute_api:os-deferred-delete:discoverable": "",
-    "os_compute_api:os-disk-config": "",
-    "os_compute_api:os-disk-config:discoverable": "",
-    "os_compute_api:os-evacuate": "rule:admin_api",
-    "os_compute_api:os-evacuate:discoverable": "",
-    "os_compute_api:os-extended-server-attributes": "rule:admin_api",
-    "os_compute_api:os-extended-server-attributes:discoverable": "",
-    "os_compute_api:os-extended-status": "",
-    "os_compute_api:os-extended-status:discoverable": "",
-    "os_compute_api:os-extended-availability-zone": "",
-    "os_compute_api:os-extended-availability-zone:discoverable": "",
-    "os_compute_api:extensions": "",
-    "os_compute_api:extension_info:discoverable": "",
-    "os_compute_api:os-extended-volumes": "",
-    "os_compute_api:os-extended-volumes:discoverable": "",
-    "os_compute_api:os-fixed-ips": "rule:admin_api",
-    "os_compute_api:os-fixed-ips:discoverable": "",
-    "os_compute_api:os-flavor-access": "",
-    "os_compute_api:os-flavor-access:discoverable": "",
-    "os_compute_api:os-flavor-access:remove_tenant_access": "rule:admin_api",
-    "os_compute_api:os-flavor-access:add_tenant_access": "rule:admin_api",
-    "os_compute_api:os-flavor-rxtx": "",
-    "os_compute_api:os-flavor-rxtx:discoverable": "",
-    "os_compute_api:flavors:discoverable": "",
-    "os_compute_api:os-flavor-extra-specs:discoverable": "",
-    "os_compute_api:os-flavor-extra-specs:index": "",
-    "os_compute_api:os-flavor-extra-specs:show": "",
-    "os_compute_api:os-flavor-extra-specs:create": "rule:admin_api",
-    "os_compute_api:os-flavor-extra-specs:update": "rule:admin_api",
-    "os_compute_api:os-flavor-extra-specs:delete": "rule:admin_api",
-    "os_compute_api:os-flavor-manage:discoverable": "",
-    "os_compute_api:os-flavor-manage": "rule:admin_api",
-    "os_compute_api:os-floating-ip-dns": "",
-    "os_compute_api:os-floating-ip-dns:discoverable": "",
-    "os_compute_api:os-floating-ip-dns:domain:update": "rule:admin_api",
-    "os_compute_api:os-floating-ip-dns:domain:delete": "rule:admin_api",
-    "os_compute_api:os-floating-ip-pools": "",
-    "os_compute_api:os-floating-ip-pools:discoverable": "",
-    "os_compute_api:os-floating-ips": "",
-    "os_compute_api:os-floating-ips:discoverable": "",
-    "os_compute_api:os-floating-ips-bulk": "rule:admin_api",
-    "os_compute_api:os-floating-ips-bulk:discoverable": "",
-    "os_compute_api:os-fping": "",
-    "os_compute_api:os-fping:discoverable": "",
-    "os_compute_api:os-fping:all_tenants": "rule:admin_api",
-    "os_compute_api:os-hide-server-addresses": "is_admin:False",
-    "os_compute_api:os-hide-server-addresses:discoverable": "",
-    "os_compute_api:os-hosts": "rule:admin_api",
-    "os_compute_api:os-hosts:discoverable": "",
-    "os_compute_api:os-hypervisors": "rule:admin_api",
-    "os_compute_api:os-hypervisors:discoverable": "",
-    "os_compute_api:images:discoverable": "",
-    "os_compute_api:image-size": "",
-    "os_compute_api:image-size:discoverable": "",
-    "os_compute_api:os-instance-actions": "",
-    "os_compute_api:os-instance-actions:discoverable": "",
-    "os_compute_api:os-instance-actions:events": "rule:admin_api",
-    "os_compute_api:os-instance-usage-audit-log": "rule:admin_api",
-    "os_compute_api:os-instance-usage-audit-log:discoverable": "",
-    "os_compute_api:ips:discoverable": "",
-    "os_compute_api:ips:index": "rule:admin_or_owner",
-    "os_compute_api:ips:show": "rule:admin_or_owner",
-    "os_compute_api:os-keypairs:discoverable": "",
-    "os_compute_api:os-keypairs": "",
-    "os_compute_api:os-keypairs:index": "rule:admin_api or user_id:%(user_id)s",
-    "os_compute_api:os-keypairs:show": "rule:admin_api or user_id:%(user_id)s",
-    "os_compute_api:os-keypairs:create": "rule:admin_api or user_id:%(user_id)s",
-    "os_compute_api:os-keypairs:delete": "rule:admin_api or user_id:%(user_id)s",
-    "os_compute_api:limits:discoverable": "",
-    "os_compute_api:limits": "",
-    "os_compute_api:os-lock-server:discoverable": "",
-    "os_compute_api:os-lock-server:lock": "rule:admin_or_owner",
-    "os_compute_api:os-lock-server:unlock": "rule:admin_or_owner",
-    "os_compute_api:os-lock-server:unlock:unlock_override": "rule:admin_api",
-    "os_compute_api:os-migrate-server:discoverable": "",
-    "os_compute_api:os-migrate-server:migrate": "rule:admin_api",
-    "os_compute_api:os-migrate-server:migrate_live": "rule:admin_api",
-    "os_compute_api:os-multinic": "",
-    "os_compute_api:os-multinic:discoverable": "",
-    "os_compute_api:os-networks": "rule:admin_api",
-    "os_compute_api:os-networks:view": "",
-    "os_compute_api:os-networks:discoverable": "",
-    "os_compute_api:os-networks-associate": "rule:admin_api",
-    "os_compute_api:os-networks-associate:discoverable": "",
-    "os_compute_api:os-pause-server:discoverable": "",
-    "os_compute_api:os-pause-server:pause": "rule:admin_or_owner",
-    "os_compute_api:os-pause-server:unpause": "rule:admin_or_owner",
-    "os_compute_api:os-pci:pci_servers": "",
-    "os_compute_api:os-pci:discoverable": "",
-    "os_compute_api:os-pci:index": "rule:admin_api",
-    "os_compute_api:os-pci:detail": "rule:admin_api",
-    "os_compute_api:os-pci:show": "rule:admin_api",
-    "os_compute_api:os-personality:discoverable": "",
-    "os_compute_api:os-preserve-ephemeral-rebuild:discoverable": "",
-    "os_compute_api:os-quota-sets:discoverable": "",
-    "os_compute_api:os-quota-sets:show": "rule:admin_or_owner",
-    "os_compute_api:os-quota-sets:defaults": "",
-    "os_compute_api:os-quota-sets:update": "rule:admin_api",
-    "os_compute_api:os-quota-sets:delete": "rule:admin_api",
-    "os_compute_api:os-quota-sets:detail": "rule:admin_api",
-    "os_compute_api:os-quota-class-sets:update": "rule:admin_api",
-    "os_compute_api:os-quota-class-sets:show": "is_admin:True or quota_class:%(quota_class)s",
-    "os_compute_api:os-quota-class-sets:discoverable": "",
-    "os_compute_api:os-rescue": "",
-    "os_compute_api:os-rescue:discoverable": "",
-    "os_compute_api:os-scheduler-hints:discoverable": "",
-    "os_compute_api:os-security-group-default-rules:discoverable": "",
-    "os_compute_api:os-security-group-default-rules": "rule:admin_api",
-    "os_compute_api:os-security-groups": "",
-    "os_compute_api:os-security-groups:discoverable": "",
-    "os_compute_api:os-server-diagnostics": "rule:admin_api",
-    "os_compute_api:os-server-diagnostics:discoverable": "",
-    "os_compute_api:os-server-password": "",
-    "os_compute_api:os-server-password:discoverable": "",
-    "os_compute_api:os-server-usage": "",
-    "os_compute_api:os-server-usage:discoverable": "",
-    "os_compute_api:os-server-groups": "",
-    "os_compute_api:os-server-groups:discoverable": "",
-    "os_compute_api:os-services": "rule:admin_api",
-    "os_compute_api:os-services:discoverable": "",
-    "os_compute_api:server-metadata:discoverable": "",
-    "os_compute_api:server-metadata:index": "rule:admin_or_owner",
-    "os_compute_api:server-metadata:show": "rule:admin_or_owner",
-    "os_compute_api:server-metadata:delete": "rule:admin_or_owner",
-    "os_compute_api:server-metadata:create": "rule:admin_or_owner",
-    "os_compute_api:server-metadata:update": "rule:admin_or_owner",
-    "os_compute_api:server-metadata:update_all": "rule:admin_or_owner",
-    "os_compute_api:servers:discoverable": "",
-    "os_compute_api:os-shelve:shelve": "",
-    "os_compute_api:os-shelve:shelve:discoverable": "",
-    "os_compute_api:os-shelve:shelve_offload": "rule:admin_api",
-    "os_compute_api:os-simple-tenant-usage:discoverable": "",
-    "os_compute_api:os-simple-tenant-usage:show": "rule:admin_or_owner",
-    "os_compute_api:os-simple-tenant-usage:list": "rule:admin_api",
-    "os_compute_api:os-suspend-server:discoverable": "",
-    "os_compute_api:os-suspend-server:suspend": "rule:admin_or_owner",
-    "os_compute_api:os-suspend-server:resume": "rule:admin_or_owner",
-    "os_compute_api:os-tenant-networks": "rule:admin_or_owner",
-    "os_compute_api:os-tenant-networks:discoverable": "",
-    "os_compute_api:os-shelve:unshelve": "",
-    "os_compute_api:os-user-data:discoverable": "",
-    "os_compute_api:os-virtual-interfaces": "",
-    "os_compute_api:os-virtual-interfaces:discoverable": "",
-    "os_compute_api:os-volumes": "",
-    "os_compute_api:os-volumes:discoverable": "",
-    "os_compute_api:os-volumes-attachments:index": "",
-    "os_compute_api:os-volumes-attachments:show": "",
-    "os_compute_api:os-volumes-attachments:create": "",
-    "os_compute_api:os-volumes-attachments:update": "",
-    "os_compute_api:os-volumes-attachments:delete": "",
-    "os_compute_api:os-volumes-attachments:discoverable": "",
-    "os_compute_api:os-availability-zone:list": "",
-    "os_compute_api:os-availability-zone:discoverable": "",
-    "os_compute_api:os-availability-zone:detail": "rule:admin_api",
-    "os_compute_api:os-used-limits": "rule:admin_api",
-    "os_compute_api:os-used-limits:discoverable": "",
-    "os_compute_api:os-migrations:index": "rule:admin_api",
-    "os_compute_api:os-migrations:discoverable": "",
-    "os_compute_api:os-assisted-volume-snapshots:create": "rule:admin_api",
-    "os_compute_api:os-assisted-volume-snapshots:delete": "rule:admin_api",
-    "os_compute_api:os-assisted-volume-snapshots:discoverable": "",
-    "os_compute_api:os-console-auth-tokens": "rule:admin_api",
-    "os_compute_api:os-server-external-events:create": "rule:admin_api"
-}
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.conf b/sys-cluster/nova/files/etc.liberty/rootwrap.conf
deleted file mode 100644
index aa466c5d5024..000000000000
--- a/sys-cluster/nova/files/etc.liberty/rootwrap.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for nova-rootwrap
-# This file should be owned by (and only-writeable by) the root user
-
-[DEFAULT]
-# List of directories to load filter definitions from (separated by ',').
-# These directories MUST all be only writeable by root !
-filters_path=/etc/nova/rootwrap.d,/usr/share/nova/rootwrap
-
-# List of directories to search executables in, in case filters do not
-# explicitely specify a full path (separated by ',')
-# If not specified, defaults to system PATH environment variable.
-# These directories MUST all be only writeable by root !
-exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin
-
-# Enable logging to syslog
-# Default value is False
-use_syslog=False
-
-# Which syslog facility to use.
-# Valid values include auth, authpriv, syslog, local0, local1...
-# Default value is 'syslog'
-syslog_log_facility=syslog
-
-# Which messages to log.
-# INFO means log all usage
-# ERROR means only log unsuccessful attempts
-syslog_log_level=ERROR
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.d/api-metadata.filters b/sys-cluster/nova/files/etc.liberty/rootwrap.d/api-metadata.filters
deleted file mode 100644
index 1aa6f83e68df..000000000000
--- a/sys-cluster/nova/files/etc.liberty/rootwrap.d/api-metadata.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-# nova-rootwrap command filters for api-metadata nodes
-# This is needed on nova-api hosts running with "metadata" in enabled_apis
-# or when running nova-api-metadata
-# This file should be owned by (and only-writeable by) the root user
-
-[Filters]
-# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ...
-iptables-save: CommandFilter, iptables-save, root
-ip6tables-save: CommandFilter, ip6tables-save, root
-
-# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
-iptables-restore: CommandFilter, iptables-restore, root
-ip6tables-restore: CommandFilter, ip6tables-restore, root
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.d/compute.filters b/sys-cluster/nova/files/etc.liberty/rootwrap.d/compute.filters
deleted file mode 100644
index 2a38cca54b43..000000000000
--- a/sys-cluster/nova/files/etc.liberty/rootwrap.d/compute.filters
+++ /dev/null
@@ -1,246 +0,0 @@
-# nova-rootwrap command filters for compute nodes
-# This file should be owned by (and only-writeable by) the root user
-
-[Filters]
-# nova/virt/disk/mount/api.py: 'kpartx', '-a', device
-# nova/virt/disk/mount/api.py: 'kpartx', '-d', device
-kpartx: CommandFilter, kpartx, root
-
-# nova/virt/xenapi/vm_utils.py: tune2fs, -O ^has_journal, part_path
-# nova/virt/xenapi/vm_utils.py: tune2fs, -j, partition_path
-tune2fs: CommandFilter, tune2fs, root
-
-# nova/virt/disk/mount/api.py: 'mount', mapped_device
-# nova/virt/disk/api.py: 'mount', '-o', 'bind', src, target
-# nova/virt/xenapi/vm_utils.py: 'mount', '-t', 'ext2,ext3,ext4,reiserfs'..
-# nova/virt/configdrive.py: 'mount', device, mountdir
-# nova/virt/libvirt/volume.py: 'mount', '-t', 'sofs' ...
-mount: CommandFilter, mount, root
-
-# nova/virt/disk/mount/api.py: 'umount', mapped_device
-# nova/virt/disk/api.py: 'umount' target
-# nova/virt/xenapi/vm_utils.py: 'umount', dev_path
-# nova/virt/configdrive.py: 'umount', mountdir
-umount: CommandFilter, umount, root
-
-# nova/virt/disk/mount/nbd.py: 'qemu-nbd', '-c', device, image
-# nova/virt/disk/mount/nbd.py: 'qemu-nbd', '-d', device
-qemu-nbd: CommandFilter, qemu-nbd, root
-
-# nova/virt/disk/mount/loop.py: 'losetup', '--find', '--show', image
-# nova/virt/disk/mount/loop.py: 'losetup', '--detach', device
-losetup: CommandFilter, losetup, root
-
-# nova/virt/disk/vfs/localfs.py: 'blkid', '-o', 'value', '-s', 'TYPE', device
-blkid: CommandFilter, blkid, root
-
-# nova/virt/libvirt/utils.py: 'blockdev', '--getsize64', path
-# nova/virt/disk/mount/nbd.py: 'blockdev', '--flushbufs', device
-blockdev: RegExpFilter, blockdev, root, blockdev, (--getsize64|--flushbufs), /dev/.*
-
-# nova/virt/disk/vfs/localfs.py: 'tee', canonpath
-tee: CommandFilter, tee, root
-
-# nova/virt/disk/vfs/localfs.py: 'mkdir', canonpath
-mkdir: CommandFilter, mkdir, root
-
-# nova/virt/disk/vfs/localfs.py: 'chown'
-# nova/virt/libvirt/connection.py: 'chown', os.getuid( console_log
-# nova/virt/libvirt/connection.py: 'chown', os.getuid( console_log
-# nova/virt/libvirt/connection.py: 'chown', 'root', basepath('disk')
-chown: CommandFilter, chown, root
-
-# nova/virt/disk/vfs/localfs.py: 'chmod'
-chmod: CommandFilter, chmod, root
-
-# nova/virt/libvirt/vif.py: 'ip', 'tuntap', 'add', dev, 'mode', 'tap'
-# nova/virt/libvirt/vif.py: 'ip', 'link', 'set', dev, 'up'
-# nova/virt/libvirt/vif.py: 'ip', 'link', 'delete', dev
-# nova/network/linux_net.py: 'ip', 'addr', 'add', str(floating_ip)+'/32'i..
-# nova/network/linux_net.py: 'ip', 'addr', 'del', str(floating_ip)+'/32'..
-# nova/network/linux_net.py: 'ip', 'addr', 'add', '169.254.169.254/32',..
-# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', dev, 'scope',..
-# nova/network/linux_net.py: 'ip', 'addr', 'del/add', ip_params, dev)
-# nova/network/linux_net.py: 'ip', 'addr', 'del', params, fields[-1]
-# nova/network/linux_net.py: 'ip', 'addr', 'add', params, bridge
-# nova/network/linux_net.py: 'ip', '-f', 'inet6', 'addr', 'change', ..
-# nova/network/linux_net.py: 'ip', 'link', 'set', 'dev', dev, 'promisc',..
-# nova/network/linux_net.py: 'ip', 'link', 'add', 'link', bridge_if ...
-# nova/network/linux_net.py: 'ip', 'link', 'set', interface, address,..
-# nova/network/linux_net.py: 'ip', 'link', 'set', interface, 'up'
-# nova/network/linux_net.py: 'ip', 'link', 'set', bridge, 'up'
-# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', interface, ..
-# nova/network/linux_net.py: 'ip', 'link', 'set', dev, address, ..
-# nova/network/linux_net.py: 'ip', 'link', 'set', dev, 'up'
-# nova/network/linux_net.py: 'ip', 'route', 'add', ..
-# nova/network/linux_net.py: 'ip', 'route', 'del', .
-# nova/network/linux_net.py: 'ip', 'route', 'show', 'dev', dev
-ip: CommandFilter, ip, root
-
-# nova/virt/libvirt/vif.py: 'tunctl', '-b', '-t', dev
-# nova/network/linux_net.py: 'tunctl', '-b', '-t', dev
-tunctl: CommandFilter, tunctl, root
-
-# nova/virt/libvirt/vif.py: 'ovs-vsctl', ...
-# nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ...
-# nova/network/linux_net.py: 'ovs-vsctl', ....
-ovs-vsctl: CommandFilter, ovs-vsctl, root
-
-# nova/virt/libvirt/vif.py: 'vrouter-port-control', ...
-vrouter-port-control: CommandFilter, vrouter-port-control, root
-
-# nova/virt/libvirt/vif.py: 'ebrctl', ...
-ebrctl: CommandFilter, ebrctl, root
-
-# nova/network/linux_net.py: 'ovs-ofctl', ....
-ovs-ofctl: CommandFilter, ovs-ofctl, root
-
-# nova/virt/libvirt/connection.py: 'dd', if=%s % virsh_output, ...
-dd: CommandFilter, dd, root
-
-# nova/virt/xenapi/volume_utils.py: 'iscsiadm', '-m', ...
-iscsiadm: CommandFilter, iscsiadm, root
-
-# nova/virt/libvirt/volume/aoe.py: 'aoe-revalidate', aoedev
-# nova/virt/libvirt/volume/aoe.py: 'aoe-discover'
-aoe-revalidate: CommandFilter, aoe-revalidate, root
-aoe-discover: CommandFilter, aoe-discover, root
-
-# nova/virt/xenapi/vm_utils.py: parted, --script, ...
-# nova/virt/xenapi/vm_utils.py: 'parted', '--script', dev_path, ..*.
-parted: CommandFilter, parted, root
-
-# nova/virt/xenapi/vm_utils.py: 'pygrub', '-qn', dev_path
-pygrub: CommandFilter, pygrub, root
-
-# nova/virt/xenapi/vm_utils.py: fdisk %(dev_path)s
-fdisk: CommandFilter, fdisk, root
-
-# nova/virt/xenapi/vm_utils.py: e2fsck, -f, -p, partition_path
-# nova/virt/disk/api.py: e2fsck, -f, -p, image
-e2fsck: CommandFilter, e2fsck, root
-
-# nova/virt/xenapi/vm_utils.py: resize2fs, partition_path
-# nova/virt/disk/api.py: resize2fs, image
-resize2fs: CommandFilter, resize2fs, root
-
-# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ...
-iptables-save: CommandFilter, iptables-save, root
-ip6tables-save: CommandFilter, ip6tables-save, root
-
-# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
-iptables-restore: CommandFilter, iptables-restore, root
-ip6tables-restore: CommandFilter, ip6tables-restore, root
-
-# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ...
-# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],..
-arping: CommandFilter, arping, root
-
-# nova/network/linux_net.py: 'dhcp_release', dev, address, mac_address
-dhcp_release: CommandFilter, dhcp_release, root
-
-# nova/network/linux_net.py: 'kill', '-9', pid
-# nova/network/linux_net.py: 'kill', '-HUP', pid
-kill_dnsmasq: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP
-
-# nova/network/linux_net.py: 'kill', pid
-kill_radvd: KillFilter, root, /usr/sbin/radvd
-
-# nova/network/linux_net.py: dnsmasq call
-dnsmasq: EnvFilter, env, root, CONFIG_FILE=, NETWORK_ID=, dnsmasq
-
-# nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'..
-radvd: CommandFilter, radvd, root
-
-# nova/network/linux_net.py: 'brctl', 'addbr', bridge
-# nova/network/linux_net.py: 'brctl', 'setfd', bridge, 0
-# nova/network/linux_net.py: 'brctl', 'stp', bridge, 'off'
-# nova/network/linux_net.py: 'brctl', 'addif', bridge, interface
-brctl: CommandFilter, brctl, root
-
-# nova/virt/libvirt/utils.py: 'mkswap'
-# nova/virt/xenapi/vm_utils.py: 'mkswap'
-mkswap: CommandFilter, mkswap, root
-
-# nova/virt/libvirt/utils.py: 'nova-idmapshift'
-nova-idmapshift: CommandFilter, nova-idmapshift, root
-
-# nova/virt/xenapi/vm_utils.py: 'mkfs'
-# nova/utils.py: 'mkfs', fs, path, label
-mkfs: CommandFilter, mkfs, root
-
-# nova/virt/libvirt/utils.py: 'qemu-img'
-qemu-img: CommandFilter, qemu-img, root
-
-# nova/virt/disk/vfs/localfs.py: 'readlink', '-e'
-readlink: CommandFilter, readlink, root
-
-# nova/virt/disk/api.py:
-mkfs.ext3: CommandFilter, mkfs.ext3, root
-mkfs.ext4: CommandFilter, mkfs.ext4, root
-mkfs.ntfs: CommandFilter, mkfs.ntfs, root
-
-# nova/virt/libvirt/connection.py:
-lvremove: CommandFilter, lvremove, root
-
-# nova/virt/libvirt/utils.py:
-lvcreate: CommandFilter, lvcreate, root
-
-# nova/virt/libvirt/utils.py:
-lvs: CommandFilter, lvs, root
-
-# nova/virt/libvirt/utils.py:
-vgs: CommandFilter, vgs, root
-
-# nova/utils.py:read_file_as_root: 'cat', file_path
-# (called from nova/virt/disk/vfs/localfs.py:VFSLocalFS.read_file)
-read_passwd: RegExpFilter, cat, root, cat, (/var|/usr)?/tmp/openstack-vfs-localfs[^/]+/etc/passwd
-read_shadow: RegExpFilter, cat, root, cat, (/var|/usr)?/tmp/openstack-vfs-localfs[^/]+/etc/shadow
-
-# os-brick needed commands
-read_initiator: ReadFileFilter, /etc/iscsi/initiatorname.iscsi
-multipath: CommandFilter, multipath, root
-# multipathd show status
-multipathd: CommandFilter, multipathd, root
-systool: CommandFilter, systool, root
-sginfo: CommandFilter, sginfo, root
-vgc-cluster: CommandFilter, vgc-cluster, root
-# os_brick/initiator/connector.py
-drv_cfg: CommandFilter, /opt/emc/scaleio/sdc/bin/drv_cfg, root, /opt/emc/scaleio/sdc/bin/drv_cfg, --query_guid
-
-# TODO(smcginnis) Temporary fix.
-# Need to pull in os-brick os-brick.filters file instead and clean
-# out stale brick values from this file.
-scsi_id: CommandFilter, /lib/udev/scsi_id, root
-
-# nova/storage/linuxscsi.py: sg_scan device
-sg_scan: CommandFilter, sg_scan, root
-
-# nova/volume/encryptors/cryptsetup.py:
-# nova/volume/encryptors/luks.py:
-ln: RegExpFilter, ln, root, ln, --symbolic, --force, /dev/mapper/.*, .*
-
-# nova/volume/encryptors.py:
-# nova/virt/libvirt/dmcrypt.py:
-cryptsetup: CommandFilter, cryptsetup, root
-
-# nova/virt/xenapi/vm_utils.py:
-xenstore-read: CommandFilter, xenstore-read, root
-
-# nova/virt/libvirt/utils.py:
-rbd: CommandFilter, rbd, root
-
-# nova/virt/libvirt/utils.py: 'shred', '-n3', '-s%d' % volume_size, path
-shred: CommandFilter, shred, root
-
-# nova/virt/libvirt/volume.py: 'cp', '/dev/stdin', delete_control..
-cp: CommandFilter, cp, root
-
-# nova/virt/xenapi/vm_utils.py:
-sync: CommandFilter, sync, root
-
-# nova/virt/libvirt/imagebackend.py:
-ploop: CommandFilter, ploop, root
-
-# nova/virt/libvirt/utils.py: 'xend', 'status'
-xend: CommandFilter, xend, root
diff --git a/sys-cluster/nova/files/etc.liberty/rootwrap.d/network.filters b/sys-cluster/nova/files/etc.liberty/rootwrap.d/network.filters
deleted file mode 100644
index 527ab40c2799..000000000000
--- a/sys-cluster/nova/files/etc.liberty/rootwrap.d/network.filters
+++ /dev/null
@@ -1,91 +0,0 @@
-# nova-rootwrap command filters for network nodes
-# This file should be owned by (and only-writeable by) the root user
-
-[Filters]
-# nova/virt/libvirt/vif.py: 'ip', 'tuntap', 'add', dev, 'mode', 'tap'
-# nova/virt/libvirt/vif.py: 'ip', 'link', 'set', dev, 'up'
-# nova/virt/libvirt/vif.py: 'ip', 'link', 'delete', dev
-# nova/network/linux_net.py: 'ip', 'addr', 'add', str(floating_ip)+'/32'i..
-# nova/network/linux_net.py: 'ip', 'addr', 'del', str(floating_ip)+'/32'..
-# nova/network/linux_net.py: 'ip', 'addr', 'add', '169.254.169.254/32',..
-# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', dev, 'scope',..
-# nova/network/linux_net.py: 'ip', 'addr', 'del/add', ip_params, dev)
-# nova/network/linux_net.py: 'ip', 'addr', 'del', params, fields[-1]
-# nova/network/linux_net.py: 'ip', 'addr', 'add', params, bridge
-# nova/network/linux_net.py: 'ip', '-f', 'inet6', 'addr', 'change', ..
-# nova/network/linux_net.py: 'ip', 'link', 'set', 'dev', dev, 'promisc',..
-# nova/network/linux_net.py: 'ip', 'link', 'add', 'link', bridge_if ...
-# nova/network/linux_net.py: 'ip', 'link', 'set', interface, address,..
-# nova/network/linux_net.py: 'ip', 'link', 'set', interface, 'up'
-# nova/network/linux_net.py: 'ip', 'link', 'set', bridge, 'up'
-# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', interface, ..
-# nova/network/linux_net.py: 'ip', 'link', 'set', dev, address, ..
-# nova/network/linux_net.py: 'ip', 'link', 'set', dev, 'up'
-# nova/network/linux_net.py: 'ip', 'route', 'add', ..
-# nova/network/linux_net.py: 'ip', 'route', 'del', .
-# nova/network/linux_net.py: 'ip', 'route', 'show', 'dev', dev
-ip: CommandFilter, ip, root
-
-# nova/virt/libvirt/vif.py: 'ovs-vsctl', ...
-# nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ...
-# nova/network/linux_net.py: 'ovs-vsctl', ....
-ovs-vsctl: CommandFilter, ovs-vsctl, root
-
-# nova/network/linux_net.py: 'ovs-ofctl', ....
-ovs-ofctl: CommandFilter, ovs-ofctl, root
-
-# nova/virt/libvirt/vif.py: 'ivs-ctl', ...
-# nova/virt/libvirt/vif.py: 'ivs-ctl', 'del-port', ...
-# nova/network/linux_net.py: 'ivs-ctl', ....
-ivs-ctl: CommandFilter, ivs-ctl, root
-
-# nova/virt/libvirt/vif.py: 'ifc_ctl', ...
-ifc_ctl: CommandFilter, /opt/pg/bin/ifc_ctl, root
-
-# nova/virt/libvirt/vif.py: 'mm-ctl', ...
-mm-ctl: CommandFilter, mm-ctl, root
-
-# nova/network/linux_net.py: 'ebtables', '-D' ...
-# nova/network/linux_net.py: 'ebtables', '-I' ...
-ebtables: CommandFilter, ebtables, root
-ebtables_usr: CommandFilter, ebtables, root
-
-# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ...
-iptables-save: CommandFilter, iptables-save, root
-ip6tables-save: CommandFilter, ip6tables-save, root
-
-# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
-iptables-restore: CommandFilter, iptables-restore, root
-ip6tables-restore: CommandFilter, ip6tables-restore, root
-
-# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ...
-# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],..
-arping: CommandFilter, arping, root
-
-# nova/network/linux_net.py: 'dhcp_release', dev, address, mac_address
-dhcp_release: CommandFilter, dhcp_release, root
-
-# nova/network/linux_net.py: 'kill', '-9', pid
-# nova/network/linux_net.py: 'kill', '-HUP', pid
-kill_dnsmasq: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP
-
-# nova/network/linux_net.py: 'kill', pid
-kill_radvd: KillFilter, root, /usr/sbin/radvd
-
-# nova/network/linux_net.py: dnsmasq call
-dnsmasq: EnvFilter, env, root, CONFIG_FILE=, NETWORK_ID=, dnsmasq
-
-# nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'..
-radvd: CommandFilter, radvd, root
-
-# nova/network/linux_net.py: 'brctl', 'addbr', bridge
-# nova/network/linux_net.py: 'brctl', 'setfd', bridge, 0
-# nova/network/linux_net.py: 'brctl', 'stp', bridge, 'off'
-# nova/network/linux_net.py: 'brctl', 'addif', bridge, interface
-brctl: CommandFilter, brctl, root
-
-# nova/network/linux_net.py: 'sysctl', ....
-sysctl: CommandFilter, sysctl, root
-
-# nova/network/linux_net.py: 'conntrack'
-conntrack: CommandFilter, conntrack, root
diff --git a/sys-cluster/nova/nova-13.1.0.ebuild b/sys-cluster/nova/nova-13.1.0.ebuild
deleted file mode 100644
index 4286faa4560f..000000000000
--- a/sys-cluster/nova/nova-13.1.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/mitaka/nova.conf.sample -> mitaka-nova.conf.sample"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.1[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.2[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-neutronclient-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( <=net-misc/openvswitch-2.5.9999 )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? ( net-misc/memcached
-	<=dev-python/python-memcached-1.57 )
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrkit
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.872-r3
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/mitaka-nova.conf.sample" "nova.conf.sample"
-	doins "${S}/etc/nova/"*
-	#rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	newins "${FILESDIR}/etc.mitaka/rootwrap.d/api-metadata.filters" "api-metadata.filters"
-	newins "${FILESDIR}/etc.mitaka/rootwrap.d/compute.filters" "compute.filters"
-	newins "${FILESDIR}/etc.mitaka/rootwrap.d/network.filters" "network.filters"
-	#copy migration conf file (not coppied on install via setup.py script)
-	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	#copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-13.1.1.ebuild b/sys-cluster/nova/nova-13.1.1.ebuild
index dd4cf54202bb..9c4fa48f6174 100644
--- a/sys-cluster/nova/nova-13.1.1.ebuild
+++ b/sys-cluster/nova/nova-13.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
 REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
index 15692ec2ea6a..a03dbc3f0644 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -32,31 +32,12 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-4"
-else
-	SLOT="4"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="4"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -189,6 +170,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
index 9e3d1150d9ac..682f644fc851 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -33,31 +33,12 @@ DEPEND="${RDEPEND}
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
 	libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-5"
-else
-	SLOT="5"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="5"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -201,6 +182,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	if [ "${CXX/*clang*/yes}" = "yes" ] ; then
 		if use libcxx ; then
 			append-cxxflags -stdlib=libc++
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
index b85a90c77a9a..9743fd448554 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -34,31 +34,12 @@ DEPEND="${RDEPEND}
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
 	libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-6"
-else
-	SLOT="6"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="6"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -202,6 +183,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	if [ "${CXX/*clang*/yes}" = "yes" ] ; then
 		if use libcxx ; then
 			append-cxxflags -stdlib=libc++
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
index 75fdff237592..e3022aab1b74 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild
@@ -35,31 +35,12 @@ DEPEND="${RDEPEND}
 	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
 	libcxx? ( sys-devel/llvm )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-6"
-else
-	SLOT="6"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="6"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -195,6 +176,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	if [[ ${CXX} == *clang* ]] ; then
 		if use libcxx ; then
 			append-cxxflags -stdlib=libc++
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
index 017df46d39a4..b6ea3cdb633e 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -39,31 +39,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -202,6 +183,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
index 0cd3df83cb9c..91916054da8a 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild
@@ -44,31 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -201,6 +182,22 @@ src_prepare() {
 }
 
 src_configure() {
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
index a56e1b0ffed3..66a832957ed8 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -39,31 +39,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -202,6 +183,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
index 10bb084eb472..60ef905d77b8 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild
@@ -44,31 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -205,6 +186,22 @@ src_configure() {
 	# what we want)
 	append-cppflags -DNDEBUG
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# Block API and thus snapshots supported on >= 10.6
 	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
 		append-cppflags -DSUPPORT_SNAPSHOTS
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
index e1886af4fddd..0cdd4846c9db 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -40,31 +40,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -203,6 +184,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
index 82a9a7a53ded..9973a8be5f57 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild
@@ -44,31 +44,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -205,6 +186,22 @@ src_configure() {
 	# what we want)
 	append-cppflags -DNDEBUG
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# Block API and thus snapshots supported on >= 10.6
 	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
 		append-cppflags -DSUPPORT_SNAPSHOTS
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
index 733b6afdba52..55be11280a7b 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -41,31 +41,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -203,6 +184,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
index 6828f5a1e2a8..db2756789691 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild
@@ -41,31 +41,12 @@ RDEPEND="sys-devel/binutils-config
 DEPEND="${RDEPEND}
 	test? ( >=dev-lang/perl-5.8.8 )"
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-7"
-else
-	SLOT="7"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
+SLOT="7"
 
 S=${WORKDIR}
 
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
 src_prepare() {
 	if use multitarget ; then
 		ewarn "You have enabled support for non-standard target architectures"
@@ -203,6 +184,22 @@ src_configure() {
 	ENABLE_LTO=0
 	use lto && ENABLE_LTO=1
 
+	export CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
+	fi
+
 	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
 	# what we want)
 	append-cppflags -DNDEBUG
diff --git a/sys-devel/clang/clang-3.4.2-r100.ebuild b/sys-devel/clang/clang-3.4.2-r100.ebuild
new file mode 100644
index 000000000000..f70930fbb9ed
--- /dev/null
+++ b/sys-devel/clang/clang-3.4.2-r100.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
+HOMEPAGE="http://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.4"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),${MULTILIB_USEDEP}]"
+
+# Please keep this package around since it's quite likely that we'll
+# return to separate LLVM & clang ebuilds when the cmake build system
+# is complete.
+
+pkg_postinst() {
+	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
+		#add ccache links as clang might get installed after ccache
+		"${EROOT}"/usr/bin/ccache-config --install-links
+	fi
+}
+
+pkg_postrm() {
+	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
+		# --remove-links would remove all links, --install-links updates them
+		"${EROOT}"/usr/bin/ccache-config --install-links
+	fi
+}
diff --git a/sys-devel/clang/clang-3.5.0-r100.ebuild b/sys-devel/clang/clang-3.5.0-r100.ebuild
index 922981de9f64..3a68db52ee2c 100644
--- a/sys-devel/clang/clang-3.5.0-r100.ebuild
+++ b/sys-devel/clang/clang-3.5.0-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.5"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/clang/clang-3.5.2-r100.ebuild b/sys-devel/clang/clang-3.5.2-r100.ebuild
index 61310b2d3a68..bfd4464544c9 100644
--- a/sys-devel/clang/clang-3.5.2-r100.ebuild
+++ b/sys-devel/clang/clang-3.5.2-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/clang/clang-3.6.2-r100.ebuild b/sys-devel/clang/clang-3.6.2-r100.ebuild
index 145a0f189b21..c44b19c6ea54 100644
--- a/sys-devel/clang/clang-3.6.2-r100.ebuild
+++ b/sys-devel/clang/clang-3.6.2-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/clang/clang-3.7.1-r100.ebuild b/sys-devel/clang/clang-3.7.1-r100.ebuild
index 2d948b3d933d..5bc3e5d7278c 100644
--- a/sys-devel/clang/clang-3.7.1-r100.ebuild
+++ b/sys-devel/clang/clang-3.7.1-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.7"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/clang/clang-3.8.0-r100.ebuild b/sys-devel/clang/clang-3.8.0-r100.ebuild
index 4cb997e979b3..30587b251bb6 100644
--- a/sys-devel/clang/clang-3.8.0-r100.ebuild
+++ b/sys-devel/clang/clang-3.8.0-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/clang/clang-3.8.1-r100.ebuild b/sys-devel/clang/clang-3.8.1-r100.ebuild
index 4cb997e979b3..30587b251bb6 100644
--- a/sys-devel/clang/clang-3.8.1-r100.ebuild
+++ b/sys-devel/clang/clang-3.8.1-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/clang/clang-3.9.0-r100.ebuild b/sys-devel/clang/clang-3.9.0-r100.ebuild
index 2df2ecad09fe..90d0de3af5eb 100644
--- a/sys-devel/clang/clang-3.9.0-r100.ebuild
+++ b/sys-devel/clang/clang-3.9.0-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.8"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
index ffbf68a66bb8..fb49629428cf 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils toolchain prefix
 
@@ -13,14 +13,8 @@ HOMEPAGE="https://gcc.gnu.org"
 SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz"
 LICENSE="APSL-2 GPL-2"
 
-if is_crosscompile; then
-	SLOT="${CTARGET}-40"
-else
-	SLOT="40"
-fi
-
+SLOT="40"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="nls objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
@@ -36,14 +30,6 @@ S=${WORKDIR}/gcc-${APPLE_VERS}
 # TPREFIX is the prefix of the CTARGET installation
 export TPREFIX=${TPREFIX:-${EPREFIX}}
 
-LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
-if is_crosscompile ; then
-	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
-else
-	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
-fi
-STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
-
 src_unpack() {
 	# override toolchain.eclass func
 	unpack ${A}
@@ -74,6 +60,14 @@ src_configure() {
 	use objc && langs="${langs},objc"
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 
+	LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+	if is_crosscompile ; then
+		BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+	else
+		BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+	fi
+	STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
 	local myconf="${myconf} \
 		--prefix=${EPREFIX}/usr \
 		--bindir=${BINPATH} \
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
index bb02942c5af4..aaf9307382ed 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils toolchain flag-o-matic autotools prefix
 
@@ -16,25 +16,8 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE
 		fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )"
 LICENSE="GPL-2 GPL-3"
 
-case ${CHOST} in
-	*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
-		LIBSTDCXX_APPLE_VERSION=39
-	;;
-	*)
-		# pre Leopard has no dtrace, which is required by 37.11 and above
-		# Leopard only has 32-bits version of dtrace
-		LIBSTDCXX_APPLE_VERSION=16
-	;;
-esac
-
-if is_crosscompile; then
-	SLOT="${CTARGET}-42"
-else
-	SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
@@ -56,14 +39,6 @@ S=${WORKDIR}/gcc-${APPLE_VERS}
 # TPREFIX is the prefix of the CTARGET installation
 export TPREFIX=${TPREFIX:-${EPREFIX}}
 
-LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
-if is_crosscompile ; then
-	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
-else
-	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
-fi
-STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
-
 src_unpack() {
 	# override toolchain.eclass func
 	unpack ${A}
@@ -79,6 +54,16 @@ src_prepare() {
 	fi
 
 	# move in libstdc++
+	case ${CHOST} in
+		*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
+			LIBSTDCXX_APPLE_VERSION=39
+		;;
+		*)
+			# pre Leopard has no dtrace, which is required by 37.11 and above
+			# Leopard only has 32-bits version of dtrace
+			LIBSTDCXX_APPLE_VERSION=16
+		;;
+	esac
 	mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
 	if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
 		epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
@@ -146,6 +131,14 @@ src_configure() {
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
 
+	LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+	if is_crosscompile ; then
+		BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+	else
+		BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+	fi
+	STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
 	local myconf="${myconf} \
 		--prefix=${EPREFIX}/usr \
 		--bindir=${BINPATH} \
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
index 0939af4b02bf..a180a2df21b5 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils toolchain flag-o-matic autotools prefix
 
@@ -16,25 +16,8 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE
 		fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )"
 LICENSE="GPL-2 GPL-3"
 
-case ${CHOST} in
-	*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
-		LIBSTDCXX_APPLE_VERSION=39
-	;;
-	*)
-		# pre Leopard has no dtrace, which is required by 37.11 and above
-		# Leopard only has 32-bits version of dtrace
-		LIBSTDCXX_APPLE_VERSION=16
-	;;
-esac
-
-if is_crosscompile; then
-	SLOT="${CTARGET}-42"
-else
-	SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
@@ -57,14 +40,6 @@ S=${WORKDIR}/gcc-${APPLE_VERS}
 # TPREFIX is the prefix of the CTARGET installation
 export TPREFIX=${TPREFIX:-${EPREFIX}}
 
-LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
-if is_crosscompile ; then
-	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
-else
-	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
-fi
-STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
-
 src_unpack() {
 	# override toolchain.eclass func
 	unpack ${A}
@@ -80,6 +55,16 @@ src_prepare() {
 	fi
 
 	# move in libstdc++
+	case ${CHOST} in
+		*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
+			LIBSTDCXX_APPLE_VERSION=39
+		;;
+		*)
+			# pre Leopard has no dtrace, which is required by 37.11 and above
+			# Leopard only has 32-bits version of dtrace
+			LIBSTDCXX_APPLE_VERSION=16
+		;;
+	esac
 	mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
 	if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
 		epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
@@ -158,6 +143,14 @@ src_configure() {
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
 
+	LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+	if is_crosscompile ; then
+		BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+	else
+		BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+	fi
+	STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
 	local myconf="${myconf} \
 		--prefix=${EPREFIX}/usr \
 		--bindir=${BINPATH} \
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index 9d1eef42481b..3540664d68cc 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils toolchain flag-o-matic autotools prefix
 
@@ -16,25 +16,8 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE
 		fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )"
 LICENSE="GPL-2 GPL-3"
 
-case ${CHOST} in
-	*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
-		LIBSTDCXX_APPLE_VERSION=39
-	;;
-	*)
-		# pre Leopard has no dtrace, which is required by 37.11 and above
-		# Leopard only has 32-bits version of dtrace
-		LIBSTDCXX_APPLE_VERSION=16
-	;;
-esac
-
-if is_crosscompile; then
-	SLOT="${CTARGET}-42"
-else
-	SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
@@ -58,14 +41,6 @@ S=${WORKDIR}/gcc-${APPLE_VERS}
 # TPREFIX is the prefix of the CTARGET installation
 export TPREFIX=${TPREFIX:-${EPREFIX}}
 
-LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
-if is_crosscompile ; then
-	BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
-else
-	BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
-fi
-STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
-
 do_bootstrap() {
 	is_crosscompile && return 1
 	[[ ${CHOST} != ${CBUILD} ]] && return 1
@@ -88,6 +63,16 @@ src_prepare() {
 	fi
 
 	# move in libstdc++
+	case ${CHOST} in
+		*-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
+			LIBSTDCXX_APPLE_VERSION=39
+		;;
+		*)
+			# pre Leopard has no dtrace, which is required by 37.11 and above
+			# Leopard only has 32-bits version of dtrace
+			LIBSTDCXX_APPLE_VERSION=16
+		;;
+	esac
 	mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
 	if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
 		epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
@@ -173,6 +158,14 @@ src_configure() {
 	use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with objc++
 	use fortran && langs="${langs},fortran"
 
+	LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+	if is_crosscompile ; then
+		BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+	else
+		BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+	fi
+	STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
 	local myconf="${myconf} \
 		--prefix=${EPREFIX}/usr \
 		--bindir=${BINPATH} \
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 239bf7257061..37b5d6f8ad00 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,3 +1,4 @@
+DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd
 DIST cfe-3.5.0.src.tar.xz 8233432 SHA256 fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b SHA512 b26a5e2cd81c150607c23b22fafc0d9c7f12b83b45e476b8e75bf5e99d42be7c98ffeac7349df664f01b00900864a01429860b298e48961861377a4b2daf3e49 WHIRLPOOL 5dd8b6fe97933b74f1668b1d753c16cd3bcd05ccf72aac1283aa449caf93f5ba88ae79e7668f7e79b554e1421549a87af21c86cf92657c1b4d77744165718ce7
 DIST cfe-3.5.2.src.tar.xz 8268008 SHA256 4feb575f74fb3a74b6245400460230141bf610f235ef3a25008cfe6137828620 SHA512 2ad9a7daa8e62cdbf47b001aa6b937a06ae7e6396dcd1832797e2d98036522443ccfca9f1253e16d531a99d1edf237fcd2b457c55491ff68ca4534a2396ca52f WHIRLPOOL 51789ba2a3193d404b26d26b999fc47f1bc4b56b45048078cc51e4ff5c31d834d360ee0c2d16096c060f85acab6de9055dc375569348ae3307e4b280406f2d9e
 DIST cfe-3.6.2.src.tar.xz 8617576 SHA256 ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512 ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03 WHIRLPOOL a17419cea329999c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8
@@ -12,6 +13,7 @@ DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a8
 DIST clang-tools-extra-3.8.0.src.tar.xz 334072 SHA256 afbda810106a6e64444bc164b921be928af46829117c95b996f2678ce4cb1ec4 SHA512 f0e593a76df5485f403079bd2fbb4e51c3d1c3fc4e63e2c2910894e8f2a7c14b47265435f3c52f035fb3fe2f595812d0f9869235296157a39c071a23e6a8b178 WHIRLPOOL 4928669a3c019eebe0a98ee72e25ef70ddf3c1d29e6a4aa18e408276b2a870069460c39e0e8fbe960d8d56127bb6951433d1fd89015d192951004e527b065ec9
 DIST clang-tools-extra-3.8.1.src.tar.xz 334768 SHA256 664a5c60220de9c290bf2a5b03d902ab731a4f95fe73a00856175ead494ec396 SHA512 ec8c4a6ac4fd1a0e24fc15e56ba00828e0d718c2f7bd477ea134ab094c67f4f4b2f603f128ec11a03b7f25f3e9b8fe75181e40730c56b7b683f54e3f37573137 WHIRLPOOL b05213cbe21b778e718233cecbf4d01b92c1f133eced6fdd3fa5059c4b10e5f0407549634f65032af177ba1614250f5c02e283c2b03563db3e227b1afcae424b
 DIST clang-tools-extra-3.9.0.src.tar.xz 455144 SHA256 5b7aec46ec8e999ec683c87ad744082e1133781ee4b01905b4bdae5d20785f14 SHA512 7d5f8d3b44e45022db65434f4d141f23706edf6aa9f3c28ded43e84e85c7c4878ffe98bf15f71e4c71fd176dfc49ce5180892d710bc5eccf95de1ed12f3c8074 WHIRLPOOL 44863889eaa33face00b9644f5c1465446bec39f88bc5ea32835dfa091a83161e292c2b3bcdcccb7cb34cdc3f1970bb3bbfbf6918c425b11a1465bedc3e0611f
+DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc
 DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512 862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48 WHIRLPOOL 248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2
 DIST compiler-rt-3.5.2.src.tar.xz 1093000 SHA256 542d7aadd21e7fe35bea0a7912bc965f08a1a566746cebcca76f96dcfeb74dc3 SHA512 319a8a1dbe07eb4f1fcccfe79a1fa445f348fb854a441500e89fa0a128e45716b65d06347f19a63de32e9294cd2331e914ae0d5fe8224f0b2452c39b79ac96ff WHIRLPOOL 6e9286c56a60a515006c8232ca01622ae844185a5f31fb49bce632868862c5e560619f1c45da66878b5322a764f91a284cd296e9f13105d6f74e055a17321d93
 DIST compiler-rt-3.6.2.src.tar.xz 1128080 SHA256 0f2ff37d80a64575fecd8cf0d5c50f7ac1f837ddf700d1855412bb7547431d87 SHA512 7dafcc5bd4822475de649d8a84ae51af3c4ed4d0958f76b1b55ba79219638f3e78eb94a1986c6e9ba0e7f1ccf3ec834d546b5ca60e8b08083fea5880ecdf17a3 WHIRLPOOL dd77e7df43c9028a6873ed903da67560fdb04968013016a7f0ad2d2e9a81b3a3d890b95e4f49a6bdef349806d6507defcd80a0a9fb50c1c9f778e7eff42dbc5d
@@ -23,6 +25,8 @@ DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453
 DIST lldb-3.8.0.src.tar.xz 10929768 SHA256 e3f68f44147df0433e7989bf6ed1c58ff28d7c68b9c47553cb9915f744785a35 SHA512 a491209ae12b0c7d938ebd94362396a50922326ed24ed11f71b1f19b61274a34a92d2bd46857b44081e7fa3e6d0a641d148bd4022f8edf71f80ff2aa7a55ebef WHIRLPOOL c498c22acab867419143745ce0212c70bdfc141dbae19ab53221908eba7961aae6a029cbad01b8409e6fbc187550141ed87f32366dd847ac57754891fbbc4049
 DIST lldb-3.8.1.src.tar.xz 10928220 SHA256 349148116a47e39dcb5d5042f10d8a6357d2c865034563283ca512f81cdce8a3 SHA512 d73c55daed6ef5e5ca784c7010f2d75be26024b14fa61a2861a8a6cbe129e417fb7be2a3b532e17e9d7de98ae38ce6a689d8166049eff365fb04f4bd772758f3 WHIRLPOOL 78dd8161cd1411bd62cb3ffe1196fe95ccb73d78f2e141a58c63776eb6d91065fe1348b1b8e241630cdf954ab659b333ebbcdcaeba3e6df36af62aaf3a7c6634
 DIST lldb-3.9.0.src.tar.xz 13754516 SHA256 61280e07411e3f2b4cca0067412b39c16b0a9edd19d304d3fc90249899d12384 SHA512 b2d7f36b4462dba8e478022da19981e2d029bc4728efeed50600f0d03e3dd4573e7fb3cee773ec19b11ad3d8ba53b1aef9de1b21612e77d2888d0f6de433b24a WHIRLPOOL 6df1ea72ae76826e318a8602105203e6456a3dd7277a3080f3d5a32958c539e34922a178e0ea32440744a5b76029eb50032eb0de2288762490b67709da89dbf1
+DIST llvm-3.4-manpages.tar.bz2 33753 SHA256 dc2616104cf333dd9ef56b2d31f9a36e81303e2c5756ff8bc221e05b46f7e1cb SHA512 8e438a9392c9b896ccb2b1460a8f57ffa01633e3a6bba61e2bf2f718d970ff96c17d63b0bc0d4da1162e1d1dc4cb9b2a9e9a14a722e8a5b5d2f205f037ae665d WHIRLPOOL 1c037a9972442937f84bc3147d77d4bbc6d6c0812c3025f3107c2ee5f6259afab990f6e1bca564237fdca8089e2372df4b7ca45cbdea686fbf891f92d1bfbbe6
+DIST llvm-3.4.2.src.tar.gz 15938155 SHA256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0 WHIRLPOOL f8b4d5167469e6f350ec41aede04e7b756e18f3d8e78b3270beb5791310a7b9b13c69e57c8bcfefbd0a78efc0c40e3b75a9a158eac72c025b7c77146e8dfaf7c
 DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819
 DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1
 DIST llvm-3.5.2.src.tar.xz 11876128 SHA256 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575 SHA512 0f6a83cc61a385387e7baf8fb8f0d9f18e3fd00d2d389a3c7e2c3792be7d82ed095506cac52c24e65ae3c1f94456a441d39440feef6125e25ef18447ec9dd406 WHIRLPOOL b41de51907d6d2c2d04a4c498b44f0ed560cc710e6e2d8678f5ef93a9009d140bc7c2406f4b25d5b901fd026689d48edce77a2e435687b489b835156a512e256
diff --git a/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch b/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch
new file mode 100644
index 000000000000..113b04bc6637
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch
@@ -0,0 +1,47 @@
+Our (gcc/binutils) toolchain doesn't do ARM targets, hence we will get
+"unable to interface with target machine" errors while building if we
+attempt to.  Disable those targets.
+
+Patch by Reza Jelveh from
+https://github.com/fishman/timebomb-gentoo-osx-overlay/blob/master/sys-devel/llvm/files/llvm-3.4-fix_darwin_build.patch
+
+--- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
++++ b/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
+@@ -27,20 +27,20 @@ UniversalArchs :=
+ # Soft-float version of the runtime. No floating-point instructions will be used
+ # and the ABI (out of necessity) passes floating values in normal registers:
+ # non-VFP variant of the AAPCS.
+-Configs += soft_static
+-UniversalArchs.soft_static := armv6m armv7m armv7em armv7
++# Configs += soft_static
++# UniversalArchs.soft_static := armv6m armv7m armv7em armv7
+ 
+ # Hard-float version of the runtime. On ARM VFP instructions and registers are
+ # allowed, and floating point values get passed in them. VFP variant of the
+ # AAPCS.
+ Configs += hard_static
+-UniversalArchs.hard_static := armv7em armv7 i386 x86_64
++UniversalArchs.hard_static := i386 x86_64
+ 
+-Configs += soft_pic
+-UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
++# Configs += soft_pic
++# UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
+ 
+ Configs += hard_pic
+-UniversalArchs.hard_pic := armv7em armv7 i386 x86_64
++UniversalArchs.hard_pic := i386 x86_64
+ 
+ CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding
+ 
+--- a/tools/clang/runtime/compiler-rt/Makefile
++++ b/tools/clang/runtime/compiler-rt/Makefile
+@@ -85,7 +85,7 @@ RuntimeLibrary.darwin.Configs := \
+ 	profile_osx.a profile_ios.a \
+ 	ubsan_osx.a
+ RuntimeLibrary.darwin_embedded.Configs := \
+-	soft_static.a hard_static.a soft_pic.a hard_pic.a
++	 hard_static.a  hard_pic.a
+ 
+ # Support building compiler-rt with relocatable SDKs.
+ #
diff --git a/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch
new file mode 100644
index 000000000000..0a1d9eb3c353
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch
@@ -0,0 +1,80 @@
+From a12fc090b3b43fe25c7de50c09782611e3834aeb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 14 Jun 2014 19:35:33 +0200
+Subject: [PATCH] clang gentoo fixes
+
+---
+ tools/clang/lib/Driver/Tools.cpp        | 6 +++---
+ tools/clang/tools/scan-build/scan-build | 4 ++--
+ tools/clang/tools/scan-view/scan-view   | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
+index b013eb5..dbbcacb 100644
+--- a/tools/clang/lib/Driver/Tools.cpp
++++ b/tools/clang/lib/Driver/Tools.cpp
+@@ -222,7 +222,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args,
+   // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
+   // not supported by old linkers.
+   std::string ProfileRT =
+-    std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a";
++    "-l:libprofile_rt.a";
+ 
+   CmdArgs.push_back(Args.MakeArgString(ProfileRT));
+ }
+@@ -5911,7 +5911,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   // forward.
+   if (D.IsUsingLTO(Args)) {
+     CmdArgs.push_back("-plugin");
+-    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
++    std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so";
+     CmdArgs.push_back(Args.MakeArgString(Plugin));
+ 
+     // Try to pass driver level flags relevant to LTO code generation down to
+@@ -6534,7 +6534,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
+   // forward.
+   if (D.IsUsingLTO(Args)) {
+     CmdArgs.push_back("-plugin");
+-    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
++    std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so";
+     CmdArgs.push_back(Args.MakeArgString(Plugin));
+ 
+     // Try to pass driver level flags relevant to LTO code generation down to
+diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build
+index 0f119f6..58f78d9 100755
+--- a/tools/clang/tools/scan-build/scan-build
++++ b/tools/clang/tools/scan-build/scan-build
+@@ -419,7 +419,7 @@ sub CopyFiles {
+ 
+   my $Dir = shift;
+ 
+-  my $JS = Cwd::realpath("$RealBin/sorttable.js");
++  my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js");
+   
+   DieDiag("Cannot find 'sorttable.js'.\n")
+     if (! -r $JS);  
+@@ -429,7 +429,7 @@ sub CopyFiles {
+   DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
+     if (! -r "$Dir/sorttable.js");
+     
+-  my $CSS = Cwd::realpath("$RealBin/scanview.css");
++  my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css");
+   
+   DieDiag("Cannot find 'scanview.css'.\n")
+     if (! -r $CSS);
+diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view
+index fb27da6..1f8ddb8 100755
+--- a/tools/clang/tools/scan-view/scan-view
++++ b/tools/clang/tools/scan-view/scan-view
+@@ -54,7 +54,7 @@ def start_browser(port, options):
+     webbrowser.open(url)
+ 
+ def run(port, options, root):
+-    import ScanView
++    from clang import ScanView
+     try:
+         print 'Starting scan-view at: http://%s:%d'%(options.host,
+                                                      port)
+-- 
+2.0.0
+
diff --git a/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch
new file mode 100644
index 000000000000..49f108533404
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch
@@ -0,0 +1,29 @@
+diff -upNr a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp
+--- a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp	2012-05-24 03:32:31.593191000 -0400
++++ b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp	2012-05-24 03:38:31.733163513 -0400
+@@ -1145,6 +1145,25 @@ Generic_GCC::GCCInstallationDetector::GC
+     Prefixes.push_back(D.InstalledDir + "/..");
+   }
+ 
++  llvm::OwningPtr<llvm::MemoryBuffer> File;
++  for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) {
++    if (!llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str(), File))
++    {
++      bool Exists;
++      const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str();
++      const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText;
++      if (!llvm::sys::fs::exists(GentooPath + "/crtbegin.o", Exists) && Exists)
++      {
++        Version = GCCVersion::Parse(VersionText);
++        GCCInstallPath = GentooPath;
++        GCCParentLibPath = GCCInstallPath + "/../../..";
++        GCCTriple.setTriple(CandidateTripleAliases[k]);
++        IsValid = true;
++        return;
++      }
++    }
++  }
++
+   // Loop over the various components which exist and select the best GCC
+   // installation available. GCC installs are ranked by version number.
+   Version = GCCVersion::Parse("0.0.0");
diff --git a/sys-devel/llvm/files/3.4.2/gentoo-install.patch b/sys-devel/llvm/files/3.4.2/gentoo-install.patch
new file mode 100644
index 000000000000..a2ba7dee47ed
--- /dev/null
+++ b/sys-devel/llvm/files/3.4.2/gentoo-install.patch
@@ -0,0 +1,96 @@
+From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 19 Aug 2013 13:22:46 +0200
+Subject: [PATCH] gentoo install fixes
+
+---
+ Makefile.config.in                      | 6 +++---
+ Makefile.rules                          | 6 +++---
+ tools/llvm-config/BuildVariables.inc.in | 2 ++
+ tools/llvm-config/Makefile              | 4 ++++
+ tools/llvm-config/llvm-config.cpp       | 5 +++--
+ utils/FileCheck/Makefile                | 2 +-
+ 7 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.config.in b/Makefile.config.in
+index dcca45f..e75ae2e 100644
+--- a/Makefile.config.in
++++ b/Makefile.config.in
+@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix)
+ endif
+ 
+ PROJ_bindir     := $(PROJ_prefix)/bin
+-PROJ_libdir     := $(PROJ_prefix)/lib
++PROJ_libdir     := $(PROJ_prefix)/$(GENTOO_LIBDIR)
+ PROJ_datadir    := $(PROJ_prefix)/share
+-PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
+-PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
++PROJ_docsdir    := $(PROJ_prefix)/share/doc/@PF@
++PROJ_etcdir     := @EPREFIX@/etc/llvm
+ PROJ_includedir := $(PROJ_prefix)/include
+ PROJ_infodir    := $(PROJ_prefix)/info
+ PROJ_mandir     := $(PROJ_prefix)/share/man
+diff --git a/Makefile.rules b/Makefile.rules
+index e53598b..217f754 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
+   BuildMode := Release
+   # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
+   ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD))
+-    OmitFramePointer := -fomit-frame-pointer
++    OmitFramePointer :=
+   endif
+ 
+   CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
+index fe87afb..fd9f2c6 100644
+--- a/tools/llvm-config/BuildVariables.inc.in
++++ b/tools/llvm-config/BuildVariables.inc.in
+@@ -25,3 +25,4 @@
+ #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+ #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
++#define LLVM_LIBDIR "@LLVM_LIBDIR@"
+diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
+index b20b6bf..fc56781 100644
+--- a/tools/llvm-config/Makefile
++++ b/tools/llvm-config/Makefile
+@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
+ 	  >> temp.sed
+ 	$(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \
+ 	  >> temp.sed
++	$(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \
++	  >> temp.sed
+ 	$(Verb) $(SED) -f temp.sed < $< > $@
+ 	$(Verb) $(RM) temp.sed
+ 
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 3924e2e..f439c60 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -250,7 +250,7 @@ int main(int argc, char **argv) {
+     ActivePrefix = CurrentExecPrefix;
+     ActiveIncludeDir = ActivePrefix + "/include";
+     ActiveBinDir = ActivePrefix + "/bin";
+-    ActiveLibDir = ActivePrefix + "/lib";
++    ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR;
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
+diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile
+index 268b7bc..e7674f9 100644
+--- a/utils/FileCheck/Makefile
++++ b/utils/FileCheck/Makefile
+@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a
+ TOOL_NO_EXPORTS = 1
+ 
+ # Don't install this utility
+-NO_INSTALL = 1
++#NO_INSTALL = 1
+ 
+ include $(LEVEL)/Makefile.common
+ 
+-- 
+1.8.4.2
+
diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
new file mode 100644
index 000000000000..cd3155f40bb6
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils check-reqs flag-o-matic multilib pax-utils prefix \
+	python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
+	clang? ( http://llvm.org/releases/${PV}/compiler-rt-3.4.src.tar.gz
+		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.gz )
+	https://dev.gentoo.org/~mgorny/dist/${PN}-3.4-manpages.tar.bz2"
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.4"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="clang +libffi"
+
+COMMON_DEPEND="
+	sys-libs/zlib:0=
+	libffi? ( >=virtual/libffi-3.0.13-r1:0= )"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=sys-devel/make-3.81
+	>=sys-devel/flex-2.5.4
+	>=sys-devel/bison-1.875d
+	|| ( >=sys-devel/gcc-apple-4.2.1 >=sys-devel/llvm-3.3 )
+	>=sys-devel/binutils-apple-5.1
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	clang? ( !<=sys-devel/clang-${PV}-r99
+		!>=sys-devel/clang-9999 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+
+S=${WORKDIR}/${P}.src
+
+pkg_pretend() {
+	# in megs
+	# !clang !debug !multitarget -O2       400
+	# !clang !debug  multitarget -O2       550
+	#  clang !debug !multitarget -O2       950
+	#  clang !debug  multitarget -O2      1200
+	# !clang  debug  multitarget -O2      5G
+	#  clang !debug  multitarget -O0 -g  12G
+	#  clang  debug  multitarget -O2     16G
+	#  clang  debug  multitarget -O0 -g  14G
+
+	local build_size=550
+	use clang && build_size=1200
+
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "The C++ compiler -g option is known to increase the size of the package"
+		ewarn "considerably. If you run out of space, please consider removing it."
+		ewarn
+
+		(( build_size *= 10 ))
+	fi
+
+	local CHECKREQS_DISK_BUILD=${build_size}M
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	pkg_pretend
+}
+
+src_unpack() {
+	default
+
+	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
+		|| die "symlinks removal failed"
+
+	if use clang; then
+		mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
+			|| die "clang source directory move failed"
+		mv "${WORKDIR}"/compiler-rt-3.4 "${S}"/projects/compiler-rt \
+			|| die "compiler-rt source directory move failed"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/3.6.2/nodoctargz.patch
+	epatch "${FILESDIR}"/3.4.2/gentoo-install.patch
+
+	if use clang; then
+		# Automatically select active system GCC's libraries, bugs #406163 and #417913
+		epatch "${FILESDIR}"/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch
+
+		epatch "${FILESDIR}"/3.4.2/clang/gentoo-install.patch
+		epatch "${FILESDIR}"/3.4.2/clang/darwin_build_fix.patch
+		epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
+		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
+	fi
+
+	if use prefix && use clang; then
+		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+			projects/compiler-rt/make/platform/clang_*.mk || die
+	fi
+
+	local sub_files=(
+		Makefile.config.in
+		Makefile.rules
+		tools/llvm-config/llvm-config.cpp
+	)
+	use clang && sub_files+=(
+		tools/clang/lib/Driver/Tools.cpp
+		tools/clang/tools/scan-build/scan-build
+	)
+
+	# unfortunately ./configure won't listen to --mandir and the-like, so take
+	# care of this.
+	# note: we're setting the main libdir intentionally.
+	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
+	einfo "Fixing install dirs"
+	sed -e "s,@libdir@,$(get_libdir),g" \
+		-e "s,@PF@,${PF},g" \
+		-e "s,@EPREFIX@,${EPREFIX},g" \
+		-i "${sub_files[@]}" \
+		|| die "install paths sed failed"
+
+	if use clang; then
+		# constantly fails for a long time, likely due to our patches
+		rm tools/clang/test/Driver/cross-linux.c || die
+	fi
+
+	# User patches
+	epatch_user
+
+	python_setup
+}
+
+multilib_src_configure() {
+	# disable timestamps since they confuse ccache
+	local conf_flags=(
+		--disable-timestamps
+		--enable-keep-symbols
+		--enable-shared
+		--with-optimize-option=
+		--enableoptimized
+		--disable-assertions
+		--disable-expensive-checks
+		--disable-terminfo
+		$(use_enable libffi)
+
+		--enable-bindings=none
+		--enable-targets=host
+
+		ac_cv_prog_XML2CONFIG=""
+	)
+
+	if use clang; then
+		conf_flags+=(
+			--with-clang-resource-dir=../lib/clang/${PV}
+		)
+	fi
+
+	if use libffi; then
+		local CPPFLAGS=${CPPFLAGS}
+		append-cppflags "$(pkg-config --cflags libffi)"
+	fi
+
+	# llvm prefers clang over gcc, so we may need to force that
+	tc-export CC CXX
+
+	ECONF_SOURCE=${S} \
+	econf "${conf_flags[@]}"
+}
+
+src_compile() {
+	LLVM_MAKEARGS=(
+		VERBOSE=1
+		REQUIRES_RTTI=1
+		GENTOO_LIBDIR=$(get_libdir)
+	)
+
+	emake "${LLVM_MAKEARGS[@]}"
+
+	pax-mark m Release/bin/llvm-rtdyld
+	pax-mark m Release/bin/lli
+	pax-mark m Release/bin/lli-child-target
+}
+
+src_install() {
+	emake "${LLVM_MAKEARGS[@]}" DESTDIR="${D}" install
+
+	if ! use clang; then
+		rm "${WORKDIR}"/${PN}-3.4-manpages/clang.1 || die
+	else
+		for tool in clang{,++}{,-${PV}} ; do
+			dosym /usr/bin/${tool} /usr/bin/${CHOST}-${tool}
+		done
+	fi
+	doman "${WORKDIR}"/${PN}-3.4-manpages/*.1
+
+	# Fix install_names on Darwin.  The build system is too complicated
+	# to just fix this, so we correct it post-install
+	local lib= f= odylib= ndylib= libpv=${PV}
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		eval $(grep PACKAGE_VERSION= configure)
+		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
+		libpvminor=${libpv%.[0-9]*}
+		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib BugpointPasses.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
+			# libEnhancedDisassembly is Darwin10 only, so non-fatal
+			# + omit clang libs if not enabled
+			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+
+			ebegin "fixing install_name of $lib"
+			install_name_tool \
+				-id "${EPREFIX}"/usr/lib/${lib} \
+				"${ED}"/usr/lib/${lib}
+			eend $?
+		done
+		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
+			# omit clang libs if not enabled
+			[[ -f "${f}" ]] || continue
+
+			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+			while read odylib ; do
+				ndylib=
+				case ${odylib} in
+					*/libclang.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+						;;
+					*/libLLVM-${libpv}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+						;;
+					*/libLLVM-${libpvminor}.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
+						;;
+					*/libLTO.dylib)
+						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+						;;
+				esac
+				if [[ -n ${ndylib} ]] ; then
+					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
+					install_name_tool \
+						-change "${odylib}" "${ndylib}" \
+						"${f}"
+					eend $?
+				fi
+			done
+		done
+	fi
+}
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index a4f1139d4952..62acb5af863e 100644
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -50,7 +50,6 @@ DEPEND="${COMMON_DEPEND}
 		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
 	)
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	libffi? ( virtual/pkgconfig )
@@ -61,7 +60,8 @@ RDEPEND="${COMMON_DEPEND}
 		!>=sys-devel/clang-9999 )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+	kernel_Darwin? ( =sys-libs/libcxx-${SLOT#*/}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index a933eb617f0e..b8805b0aacf9 100644
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -55,7 +55,6 @@ DEPEND="${COMMON_DEPEND}
 		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
 	)
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	gold? ( sys-libs/binutils-libs )
@@ -68,7 +67,8 @@ RDEPEND="${COMMON_DEPEND}
 	clang? ( !<=sys-devel/clang-${PV}-r99 )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+	kernel_Darwin? ( =sys-libs/libcxx-${PV}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 7db30d1df19d..14a2e82d508c 100644
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -43,8 +43,7 @@ COMMON_DEPEND="
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	ocaml? (
 		>=dev-lang/ocaml-4.00.0:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes
+		dev-ml/ocaml-ctypes:=
 		!!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
@@ -56,21 +55,22 @@ DEPEND="${COMMON_DEPEND}
 		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
 	)
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	gold? ( sys-libs/binutils-libs )
 	libffi? ( virtual/pkgconfig )
 	lldb? ( dev-lang/swig )
 	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( test? ( dev-ml/ounit ) )
+	ocaml? ( dev-ml/findlib
+		test? ( dev-ml/ounit ) )
 	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
 	clang? ( !<=sys-devel/clang-${PV}-r99 )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
-	default-libcxx? ( sys-libs/libcxx )"
+	default-libcxx? ( sys-libs/libcxx )
+	kernel_Darwin? ( =sys-libs/libcxx-${PV%.*}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 4846dcdb9b29..81d3f0fbe2fb 100644
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -56,7 +56,6 @@ DEPEND="${COMMON_DEPEND}
 		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
 	)
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	gold? ( sys-libs/binutils-libs )
@@ -69,7 +68,8 @@ RDEPEND="${COMMON_DEPEND}
 	clang? ( !<=sys-devel/clang-${PV}-r99 )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
+	kernel_Darwin? ( =sys-libs/libcxx-${PV%.*}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
index fa91fb535861..ae3d20555fd5 100644
--- a/sys-devel/llvm/llvm-3.9.0.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild
@@ -45,8 +45,7 @@ COMMON_DEPEND="
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	ocaml? (
 		>=dev-lang/ocaml-4.00.0:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes
+		dev-ml/ocaml-ctypes:=
 		!!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${COMMON_DEPEND}
@@ -65,14 +64,16 @@ DEPEND="${COMMON_DEPEND}
 	libffi? ( virtual/pkgconfig )
 	lldb? ( dev-lang/swig )
 	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( test? ( dev-ml/ounit ) )
+	ocaml? ( dev-ml/findlib
+		test? ( dev-ml/ounit ) )
 	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
 	clang? ( !<=sys-devel/clang-${PV}-r99 )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
-	default-libcxx? ( sys-libs/libcxx )"
+	default-libcxx? ( sys-libs/libcxx )
+	kernel_Darwin? ( =sys-libs/libcxx-${PV%.*}* )"
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index d7470a269db2..17f78ea432ae 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -32,8 +32,7 @@ RDEPEND="
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
 	ocaml? (
 		>=dev-lang/ocaml-4.00.0:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes )"
+		dev-ml/ocaml-ctypes:= )"
 # configparser-3.2 breaks the build (3.3 or none at all are fine)
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -45,7 +44,8 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
 	gold? ( sys-libs/binutils-libs )
 	libffi? ( virtual/pkgconfig )
-	ocaml? ( test? ( dev-ml/ounit ) )
+	ocaml? ( dev-ml/findlib
+		test? ( dev-ml/ounit ) )
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 979bd348b39a..44a56f2b2e7f 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,14 +1,10 @@
 DIST aufs-sources-3.18.25+_p20160627.tar.xz 170100 SHA256 8d22f32fb944c239ca37a1a33b4c05241391e8d499fddf2eefa36b94a53e0304 SHA512 3e0a6e356f92918bd9810007f711629ecb2804003445a6e5179b2773d027cc3d7705cbc125444f5b9fab5771d1332dba337d6f682490447761fe83b38c1157d8 WHIRLPOOL ff37794dce145e9eea89de76714c13f9d69e7210f06337e8d103ad8305d370003c6c1d4272f8e568f4a32466ea1f5f38816174dedc180a5500b5bc08097fea81
 DIST aufs-sources-3.18.25+_p20160801.tar.xz 171144 SHA256 05dcb15e13b29244f9cd1a5ad0b6b649e0b5da1eb1cad45083fddb11a236ee43 SHA512 5a8b22076ea2d8456cbe55034ec52735008b4ab09c01c35d6673322d2ebb0c40981fe94ea814aba8f3a959edaacd6377c25c243fb3d6bedc6ac43dd85e287ded WHIRLPOOL 0f629288cb66f30120c59a52a038eefaac93ad51e82257771fc4f6cf80b867fcd4c6bf3a753ca18b5a47a8cdf9e79e440965c8a3af9b3633df755936866a5cb5
 DIST aufs-sources-3.18.25+_p20160815.tar.xz 171104 SHA256 d2c48508f8997e6c171bad2609e12bbb166e1079afa1646488850340311ed71f SHA512 765401a16a820a011077a2089a295509442e88e403e99c51c592f42603f9c6c2d53f29e13e6965872cbf5efc16c5df15ed44bb0c3f594aa48f30811d81e6cad4 WHIRLPOOL a1967d54fff71d43809c7dfa1350d35558324bf4d8de9c6e7d817de3d8e159a1f798fb77996bcc6e755a0c444958391bb65989179f9ed06891074bbd0f3b5087
+DIST aufs-sources-3.18.25+_p20160822.tar.xz 171116 SHA256 824a1ef783c4091c20e80b478aef8d75bca5c85db79eaa15cdf7fea00416d916 SHA512 045c48c4c4935c22637c39540fc89bfa8ead69b2993c9d258a88466860c4227b99e4dc75234ec2402bdee0119d2554129cd76719423d01ed5a4d74768dee0347 WHIRLPOOL 446cf17e62468e668b1f88cb1ba9901e8030b968b0ec5a4f76cc3b2921962fd3e3a550441ce65cbf4d13152ee08d27640ca9ae5cddd287a1d416f665ac46ebe7
 DIST aufs-sources-4.4_p20160328.tar.xz 169384 SHA256 0e9b22ab0b36ef88ee464be70fdb1d22081dd34a4b5891d1b236056141267793 SHA512 bc055618c54ff5a7fb209458ca55b92fdb9c59044a7c395297e7b9340d0de3ff2e9d8230886dbbbfa503fb1e1ea2f048142a9b6983c1d65f09c348d71caecb1c WHIRLPOOL 0f4befa1bb71b9f8deec1dd0750100484745d1a6b7aa007dce890e24b77defd2aff48803e93f3d7eeda1f32d0132d75abdc2820869c080f7b4e75d7a8e370404
-DIST aufs-sources-4.4_p20160627.tar.xz 169684 SHA256 ba23c870c2132922629012ffd697ce8ee7c0937f711192471874e7a6b4c66fb4 SHA512 f4bdddd429de2e3df7e482c3df917633ed638cfa8fe31e9410af8c0d3dc40265a45f198b25368b904320248caa89a1e9cd869abab1be1d0f17eeec5b57ef50b3 WHIRLPOOL f39de6d8babb28fea0b29c88c6a0e52006ce499412ea29d29ad51a7db1ea2c402514593ec6f5acce2cc6a9014b2972b1b0a9f71edb8707f8bd1d8d79423d6596
-DIST aufs-sources-4.4_p20160801.tar.xz 170812 SHA256 6633f46e69ada7bdc21eebdc9868889e482166b4fef99da73a673c40fcd1c0e0 SHA512 8c741c3d775352ebbe097687cc38f7140ac192dd5f1b6782aa7e111c8bddbd5f1a908b8a1e50db19efe8e188dc2be4923c95c7a8d985cdc6d3863a3d9863e64a WHIRLPOOL 5f051dfea653b9c2f4b6f1ed7f55e36ebe336858100b9f161c7ba5c5382bc65550db29a4dd335fcf1a9b64d1bc14f6e58e24cda79a5e42958b095cce92e10b87
-DIST aufs-sources-4.4_p20160815.tar.xz 170720 SHA256 52b37ccc0f2966c244de5d7d4cb0b86b72e667ebf02658257ad0ec3970f09b98 SHA512 777b6f2dad6b23b6ffca04a86817b2b09988fa245ed05b0ddcc0bfb08e597aac1d8a9679b154d5423487e8f8e4ef305a338186f6278cf3e46bc78f7cc8e4a1d6 WHIRLPOOL 9b82b5221f958a1e63459f48fcb0df668239f21dc6126b68d70e85612fd190b3e3abf2df025753bec63ee55cfbd266bf47226b77ec900053c02dfb92977640c6
-DIST aufs-sources-4.6_p20160627.tar.xz 169172 SHA256 9af36ceb3a249d5cfa6cb7e2886819e93d3f0e7f0d2e205ed175021fe18068f9 SHA512 b0b81afd408ba2c72767029d657f098545219098ba7ad59cf0a8a7306daa67232e2c965021a891929e6493119acc11a42666b2711bacfb48f2c26d2449199edd WHIRLPOOL 8a966764997a67052e19811ce854d456339a6e35744c1a0241b8e8d672e2785f2812250d750398596f552eb8d0bcd624437abc50d8b7210c8ad2266eca6c254e
-DIST aufs-sources-4.6_p20160801.tar.xz 170232 SHA256 23eecb2ae5d1d6ccff68e2693cc4c1232fc7493b363e469d269f12ec2c166673 SHA512 591cbba31c27074d89bc254169cc2d3d992afbcb26b28a64d09c2c67b4eee4aa359c718548f344b14c49a29bcb9d2454e3a91f4df8a86c6f6f1d7ec26ce1b10d WHIRLPOOL 495f0673f81c578ecd02f726ca979cfcb22fc2e23abc824042c8ef11a3c310480eebe6fff2bf4a6c61964265cf2987616e6d9badb6c37ef3105f9c5eca86d1e1
-DIST aufs-sources-4.6_p20160815.tar.xz 170176 SHA256 7f8341b069950a62291939f6f997d3b0b80b7fd8b387781f9302f382e7dba703 SHA512 015efb2822a8c6d9e3e3dfa9ecba4a9b17ed2b9b9e5fedc7e519c9fd879f56c79f8fc90be07b5977ea9573ad17a0cc6c2de60c7a836e7eac9c37aea7bb74b5b4 WHIRLPOOL 3000f50b5526b0fe81c79848951d80934214ae300e1311d9d3e6fa0c8dc7cd153c21dea42f0321627216a06611c51e6e153de1e8ff7bc504ff48a27cafe18ea0
-DIST aufs-sources-4.7_p20160801.tar.xz 170264 SHA256 fbfd571332e82accd8618bc13f7187a69bc3b0bc8ac16656ceb5a48e14170d01 SHA512 f4c382316f934b3e81b3f024feba06be6f1c66ed7de60c316f709ed67723e9234eb0a81c5f6a77506d80639b5aa0c7700e827adcfefff127fa1ea9b3ee8948c4 WHIRLPOOL 788eb5e22ac697cbf7dfa72efcd4df145f18e7cecc5a710dcb352dc848d8dba54fc3dc4edd32222fd33adb9cb76665e434b4dfcf8397f133d065908c07dd8d1e
+DIST aufs-sources-4.4_p20160905.tar.xz 171064 SHA256 dbab7b93189fc0c5c29e3e8d9f7535d872e2da1eae0709f24592faf0ef181b33 SHA512 1e308ce5f966217f0f38eab9bcb8cfdf7e56119688183a226a48aa7e6256796628ccab7e9c53f531cf6c4bc1f5c08a7dd6b683ba6b061ef95a793528b3701a98 WHIRLPOOL ed647f202eaa6a869a37527a4dd70eb23b88fef23a9e2f511748277882392f744f242d12fd6d4d006f1030f963297d41ce9e5b400d54d064a9068711c40fd6dc
+DIST aufs-sources-4.7_p20160905.tar.xz 170608 SHA256 45ffbdf81384da74b2217df63b6f94ebf1126d282f68a332183e21096207f708 SHA512 ff9e8b807f64b2377a2638c819df5116047a1857be52c8d26237360c16a423bb92eed6e44879aabf3b7a789443bf89011ca299305c91c05cd647ab33313d1a5d WHIRLPOOL a9fc7da64bcaa506a45551f209c82011ad7096ade329d76b979ce465960f5c22d9dfb4ae7b044a14fa3ee523fee07a7e78af9231f6917fef7b7108f5b3dcbdcd
 DIST genpatches-3.18-36.base.tar.xz 989348 SHA256 927971c003aa92f373d6a3d8e8adeafa7d423feb36f1e258e21f7349561e0b9b SHA512 f2357160e5358efbdc4c1f92996fe4958d1b93340b975bb077d5ff997bcbb7054dd145821174d102bcf42c4bc996a45008f157a919693f76ca03755ff67e331c WHIRLPOOL 424d95b03f514f0ed9661303a9211aa1c07a7fafa18bb43a70f2965ab86743efe7df52c35664be596c79ee8b13d7dee1cf9550987f8f60618b9b4676537c7e6d
 DIST genpatches-3.18-36.experimental.tar.xz 61588 SHA256 1b0a9d09e0640935550c05291a1781e1125656575d072104e0481eaccd27fb3e SHA512 97f9e9343e1089c711d1d1607044ffd026e991d3999699bc3398fc7989c296528e4a55996067c441be8fda77e7e92da99c644fd81d944babf9f54c6154dfb8a0 WHIRLPOOL 8d1797909ed854168efa58790cd1438355ffa37807f14f8757774720a3fe96bd54fcb6331e3e4e2ce1f8f60e8fc817ecf37d0c028e47259c0cfe11a7a574a165
 DIST genpatches-3.18-36.extras.tar.xz 16180 SHA256 e8928932e41ff9f86d396df8260d3144d47ed1004a683ecfd04454acf02e87a0 SHA512 1155b2f629c4d80415dfd9925a0c115bdbdc4cfd1984bdcef55ac40b33b602837172624ea04aa08d213147f78e6e674793bee465ef75662a69850aff04b15f6e WHIRLPOOL 67a0bec3e880ffa1163b679b145f14d9e77fda01d01fc4fba7e4b720c1e79b3d2f5dab1856bc7cf214811eb323ec3e81e110bced99a44738c1ba7e0276b16f46
@@ -18,43 +14,18 @@ DIST genpatches-3.18-38.extras.tar.xz 16192 SHA256 f30c135fd6b6d0739ea10fc5086d1
 DIST genpatches-3.18-39.base.tar.xz 1063424 SHA256 1b894c5766a8cb21c553e467668ec8b1295ff96f37b25b0a9ea750ced30c611a SHA512 523da4c6413204ce6dce46626359b50cd4c31988424fba8546ef3bbb75a3ce61af068dc35ddc1f240a177192b715cff62608f95ce3ac453a5eb84ff12c79fb7d WHIRLPOOL 10d90308afd912266a91e9dd4cfb724cf11f0dfd46103a832126cfc0728deb6f7a09516e9f5e8ab7fb64aa0fba9d06acf5645df42289867e29b42c6642a0c000
 DIST genpatches-3.18-39.experimental.tar.xz 61724 SHA256 196f3ad4cab22c70035584b49e308a6486d5cf0b5f6915f8c368e7d55fce4e73 SHA512 f91f1150630322067d37835e00c70b68dc58b9ca09f34900a9206103d3304bc83cf40ee4cada16ff6ca65148d67aafd3b2b2f298f96df1321f45e48200dfa766 WHIRLPOOL ea8a14dc9be196e250491cc76c08ed8eb470d8c406722c8cf0af14b16ee00a74edafddf7663095d99826d9240631fb312e14aff9614437699304cf7d72380bf4
 DIST genpatches-3.18-39.extras.tar.xz 16192 SHA256 2cd12e21f1fc9513d12d1dd9c42db1cc72a6140c6e7af4deec6abae0c3ee335f SHA512 04aab296a48a49c0228c4e22c0a4f2aa9390b66970f2975424b1d2ff4ecd3ee4448ec282de7ccf72e1828d1a29cd9ef213f2fbb81f178554fb1b0c1c2db2476c WHIRLPOOL 0d51d0fab944e7f38e0a5ed80dfafafc92e5ed2ba745a284ea97738d3ff6e20dc38863b8641c3c2316e0374ba15194ec85c6ee7fedb3e9fa245d16b40e7ed591
-DIST genpatches-4.4-14.base.tar.xz 450668 SHA256 7d6da245348f8168a831c45ac528e7cc25b0cf30b3d3df497e621e975078392a SHA512 3d5b1e3ff79312e7572027e2f9f8d983af25241641a4b2dbe06cd37f83f1ebedbd1b239663953e2f7ec089e147c98e59da4d8150809ead62ab5f76803225ea8b WHIRLPOOL 3eba605e664d10ec0bed2d0811318da17a501d350e22bc85e09a5cfe146f1d0f13464ef4ac8141aeab92db817c4039222e6834b236c61bc22f71ef0f83d1973b
-DIST genpatches-4.4-14.experimental.tar.xz 62632 SHA256 48339c300d271eb355394d15985b80720c36c92fd8bbc9e5d2196d042b9518d4 SHA512 e98ca9b75bde2857ad8ef0ff6f84b3389f1071c2a34ce319daf8fdd3cfcb22990b198b33643ad0a2395841f5c4bb413cf4d7952a6ef2686b3cc92c91cca1a405 WHIRLPOOL 370b865907d97ffd4d1ec7d2f3c3d705669aa5321bceb636b826e97412c1121ddbebd79e7b4fcc7107fe508322d27d20f1d84ad5252a9cbcaf3300b19d82153c
-DIST genpatches-4.4-14.extras.tar.xz 16284 SHA256 fa731c56b2ef13c98ec21714dbfe6902de90e5bc50a9be65e3c9ce34e934674c SHA512 0aa85413fc225e86405ad79ca96345eb2cd1bfa91ee15d0167700208fdaa86c6ca9af4461f9f9c29371b000bc0b769504161b21c9dcf8e24cd7db222f3c4b99f WHIRLPOOL 167c7bea5b1a6c978a1e4b01b524dd43e85973c1df095a16e5c7f8defab18cc2b5a1dc9cfceceecc834595c8f98c18feed950f858f5e81967d31c216f3181639
-DIST genpatches-4.4-15.base.tar.xz 475448 SHA256 d5da1dbfeeaa31bc49c2087e2f594d1d20b88f6bfc85500f1c4b9ea6f5c481d6 SHA512 72d8ffc65b4ea18a90d3d198f8a95d1e9215fc546da87bee76ad3bc740962d1531b4b79851d5bbb5fcd6b2c25af02e0b75f9f5ff43c010533dde0530fd000751 WHIRLPOOL 66723d839aafe08c0128a47be6fe23803e594e72c30753d55a707ddd8dcc9c3a98abf6be37e4586a0193dbee9d35d130644b34fe29f2616675cf4e182a001173
-DIST genpatches-4.4-15.experimental.tar.xz 62596 SHA256 20fdf04022034241dacf8c82fc0c9eb89f0eabc491fe58390f9f6e8ed2660c5d SHA512 3a3436390b9c20151a5be784ccf3b5369cb9dfba5e6e8338b73a7a1cede87a25d32ecbcad300b60497a3b1d39ce812e9e8ee4202d7a754905b717ceeaaf93609 WHIRLPOOL b3d2fac5faae8a6a89288f69a7a4b82526ed28ab68257c29666946ea63431cb45d552c4eb8e28e25cb794f3fbd0b1d8e46058b5c9dad9eaa4dc94eaec259abe5
-DIST genpatches-4.4-15.extras.tar.xz 16276 SHA256 8a64849ebfcc329e98358970f26e1d2a0fcf526e725d7f81dc2583e1810056f3 SHA512 bc999d7afecab481398b5933ab22835f53cf580bf601da5fda87e749adacb74889e667c08367dec39f2c8072601e38e2494c48f9eefb685749f0f651148cfb7f WHIRLPOOL 0832c001db9641ff78eb1ac1b10a5325359db29471208fee63ea76049687dcac6e68727a82d4f5933453571cf12092fefa4b1c3dc7de902dac4fe1828dde3585
-DIST genpatches-4.4-16.base.tar.xz 502036 SHA256 1b26f6891a70ab81b12e283379b7cbc98774656dd78a0d95377988c2820c29f5 SHA512 464223d3af4eb8ad06bd2ed2d85a5263447a5cc9db2039b9d41a61fa08e5db2d776f1810be4d9f342ae32e1ae195119497dfd85e0d3fb92e2ef437292a7259a7 WHIRLPOOL 03b86310b9b9621f9129077dd8b2d989c8efd779abf99a4bb59701a5312b2e46125cd6c15bdb8f9bf2cf856605fe9c5ca9a8328b2dbd551466afea775b6ae9bf
-DIST genpatches-4.4-16.experimental.tar.xz 62616 SHA256 efe6a2cbfc66990f4543858ee5187b047154dc1b030a950c629a650834396135 SHA512 93229b1daebe27a11d42b1de6f70ea64876b4b148869e89f79fc2d25feb9ed2425f9b985cf0e257315c48c735300b7a17f8e5ad7a4b9c19c47a30f7f46172aca WHIRLPOOL fa5157423fb59eb520d913293ebe2f7991487dd20dcbf2038a76c5f98859b954325e59726d6a7285621cf33d02c85826b72d6fa23d6ff03c5983c20dfc5b1780
-DIST genpatches-4.4-16.extras.tar.xz 16292 SHA256 3c6ba4c5c30ee786c0909aa0f8a68f00c15584eb52ab91ab01810be36716eb07 SHA512 7f1a57ffc8c7e432f46cdf28b97a44207a77fca86231874489c82a01652ddc7e2027a1a8c3fbd53dc36a8d302faf0bfed123af367dac173df215598a08548ab2 WHIRLPOOL 94179e36ac0dc1bbf8d402cf7a7f40d37d53129a8211f59a5afc43121be3b698aedd297bbbb0e04a5d488398cc1c59a431ec5d048b040d3f57bb817392a1a915
-DIST genpatches-4.4-17.base.tar.xz 510308 SHA256 bad69283e22b77a97c572afb848cb3b4610924d6cc7557b46c926380f320ba26 SHA512 3b572253e78528d4a6aaef9f8899890a1e8439f8e41ec821ca0eb9b99fdccede508a66526d4893e7bd67155f60b57cda6629017854500b5af6174bc8f49feff0 WHIRLPOOL 621d99cbe4253e7dd502e94fafb9d8460356bf8f8358e458663c61decc5ea12959110175190b6d9537a76476b8ce4d986ca350965c7fd89850c03c41493b594d
-DIST genpatches-4.4-17.experimental.tar.xz 62736 SHA256 6a5ab4cba3055c7984903019e9695461be7e137179a7e045d938cc08a47f9267 SHA512 f64ceb9f0257dc399ba219681c018113dd8512b8ebdd8a5462dc60c69db9da13b55ddd6ebea45dc08540396d68af8af16eb992404b1e151d8db06679a2000eca WHIRLPOOL 9b8eab1ea47412317929e9ff0539422023e9d521c12b6ee8bb4a7ed177944e4f02f2ef767cfa893a5c882b1ec0affa050abe78e47c88fb1ef507be8655ff52bd
-DIST genpatches-4.4-17.extras.tar.xz 16376 SHA256 07b7ef68c9cd60b5e913c4a0793b7a7bf70e4324990c49df8420ab6017140871 SHA512 053deab96a0c481deb447a8a427a3c321312a61616c5ac7dfe9c5a3fc30369848eda5e4606141839cfd79a5ba9b88e206bfa1a7056af6d4886c5289d997edd8c WHIRLPOOL 2f290ed641745b89203d24b7fe9b7964704480e257d3d618a12ec87ebed9f0680be65b80f569073d3085f0009f8986f4878f7c8ad7bcf19b697382a0e275ad62
-DIST genpatches-4.4-18.base.tar.xz 550920 SHA256 9e2400aa9719b896594e6858fddccf68180ef0e71068ddda45f2ea8ab256f2d1 SHA512 7a223c38fb71a33f4bdde007c357ea361921920e02fef398d0537061fdb36ed1a7cc06d083f63456f4e628ee5b3c0c7b96183d6b21582fa88c304592ccf1ba06 WHIRLPOOL 279c9ee34fd06e09885387f8eef97340d24336d7e5b20cb03ccdeeb8c1942e72ead2934bc3b578dd5d39624b562d31cdb643d41624fbf9c39129bc5ecaab6f6f
-DIST genpatches-4.4-18.experimental.tar.xz 62748 SHA256 a289967a87732f9726a70b9f1b8fc52bf23de7d5e4aa632016726a719005c823 SHA512 65b16b611f58e36872afcb04c75021a9351eade6fcd9977a861a5e4e2e0a3fa118bc33041901d549d5a8f36d4a6112b347a60a5f41d52a634a048a163d09c954 WHIRLPOOL 866e5b08f12a44b9ab94b69b86591c065b5b73dff866a1630c2f044a88401b81220e37595092ced5edaef7c167c1a896674822af8db7e7ea63378125e38889a2
-DIST genpatches-4.4-18.extras.tar.xz 16364 SHA256 061d2094e28be6d1048ebfa0aff3220bd76786257d957f7e56176f4081229855 SHA512 a82512c71b31e975a5290746c58a89135c3c106966c327bbd9854d011fa850592a086d53527c0e98a9b4eabd40c0e62f3a1eaf071edf0e9fd98c37906e0ede81 WHIRLPOOL 176eaf5260f077b581dc178b81bdf21cd0f6ebbb4258706cc3895ec786fad470ebd66a1596be168c38bd803aa4c91f5b87b7248d80696aa11e322e1a9f3a4254
-DIST genpatches-4.4-19.base.tar.xz 565524 SHA256 3a8cf8120a5574f8a08b9255530a06873957c74aac0e805547965c38bad08422 SHA512 fee9ba9cf495ab7f8767df5704ed9ecdf6e864b5084ba1d6ae451d9327a67bf22e65352670149c2fd0c6cf4a48a9b495040f9b3cc09cbc757eecfe76e63373e4 WHIRLPOOL 7a2367c594db5402ac1f1c87ca25269ac45ababa412ba5d387316d614c1471b71c8e51499f9378c351d39c68fe4c2ecbe9a27745770f5cdb196c57973b5ae9b6
-DIST genpatches-4.4-19.experimental.tar.xz 62748 SHA256 55e24470e34c912f70b0a951cecf235bd4ab0dba7665498e0a4ea87aa366b2ea SHA512 0cc699cdaeded8a852f439a2f21fdef5d3279af7ef01f24f9c575d75d0abcd18edf765a14a56950f837e17e36b67f5088c9f43d58a98ed9b1e2cd9d54ffeb795 WHIRLPOOL 022b4f6f0aec1107432b3103cf23677126740b66a226ab5d075e9d9aa3cc5fb66d677ca96b57bfeb5546b5aea814cd227e93abb028cc982daba893c35903b61f
-DIST genpatches-4.4-19.extras.tar.xz 16356 SHA256 d7d7d862befd6a649023d104af39e53e7f4c09ed6b1e560679ede7e31105db81 SHA512 dc6cc91ceea8773c462326b2f11233fb1bd71633058610132cc06afce33ae8b73086c3ff415056d24fba03c57d5d5f0a2eaafa2eeb52807c17aa84923dea9a3c WHIRLPOOL 138da0553d1aa62b57e4f7ddfeadb9556cdc5964a6f646ac1bc54ba7f0ec56ad58ec112b4aecb96ec3b9153e557346bb0ed7f07a3ce30500e6faf2a69dc6103d
+DIST genpatches-3.18-40.base.tar.xz 1089632 SHA256 66615737fa4633df2b2061f6dbd09c4e67bbb503599ccc312f557e7a8af5928e SHA512 6ccc0994071328a732c00ef919317a97ded933175231de8f3edf8a3319d7885a2265822a6c64402221b4a45ee683c14042f88595442dc1f83c2e35a11f929f69 WHIRLPOOL 0a8da82756274dac9fa32f7b2c93a5321948e20d5af90e61cc801a60644b84e586e9df1c3f9bdfa3763356ccdfd716ff2e453b4c84192f416d994af77aa5f71c
+DIST genpatches-3.18-40.experimental.tar.xz 61756 SHA256 c54a6bf89a6ab07bb378942bd2926de7bad637672b6d68e3acb2bae8a0665818 SHA512 d400f35b0c8d2be08d61cafa72f460eefcb813052edef619ada875bf664273564bc40352a18d91506eb975a4a2b7e7b11827b0c93a3168965e1c8c20e3bca44d WHIRLPOOL 6d38e4083ecd2076c7436a25a7290f4265f31300ff1ae760a7ac6f5c5c1715bc5d80b7df7d11221c5aa157eb22b1ab1c854f3e0686eeb3d9ae209ac7bbbeef4c
+DIST genpatches-3.18-40.extras.tar.xz 16192 SHA256 f30c135fd6b6d0739ea10fc5086d12493b2075516d6f1ad5e6bd951c22908b44 SHA512 745f9c89ff751128a2276a9d54b3b75d4e392279ccb54eed871281cb615dae870b2d8f5f66bab4301b93828de9d9e5bfa1495d9876ee4d14b34ce6f0b0279a37 WHIRLPOOL 2178c15e32835634c6ca2556c79948c3fff8c44e414c932037b80f095602b95e4c448c6deb5a5970ca2942791715a4ce7583e37166599c5e7b87969f2aa82791
+DIST genpatches-4.4-22.base.tar.xz 644548 SHA256 5baced2ab2eb8b511d8c6d760e1fab1048c4b4a08e0e317e9a02815143582e08 SHA512 aeb751aad975c393c32be7dc637aa276308a296bed15a7ce825d7f6e478beae5b5cdfe728ede25f7e3c3e09f65d2f2490483cfa0abcfcc8a5607606cdbed6d36 WHIRLPOOL fbaace97e76482bf1cf69d4069b07aee317d98e50b894aeeefbaa5bf5f4d001727ce819a8a28c0555a35a9534f9fb8c8f3740bbfbaabb8cd46f656da68da8004
+DIST genpatches-4.4-22.experimental.tar.xz 62732 SHA256 bc2b45d3a36864d3867d7732d98efa02045da605677046519ffd62bcbbacd592 SHA512 20f00f35eeeb1b4592430275ca207d0217b2e70ea469a655e05df14147ffcaccb94c5c4229a491d6b68d4d19968e601ca78173dca8e39620b07179b1a59817a0 WHIRLPOOL f3d3763cba232be28c5327857b4da6b81e9ee4ed3d2d263a9742ff9d5278218bb78b2671307bf30c39fab9718a5f1110d131dfbaf534b212efcb41da40ddb3d4
+DIST genpatches-4.4-22.extras.tar.xz 16360 SHA256 a3335977ecc84df581ebb7dcf40fa342ff1be0a99a42b29d13fe3a1fc88a0cb3 SHA512 7ca83e63bc52736fe6d465d231a3953e02f9430a9c78e87ef114ddc19cba6abe2c45bc0cdf82c833f0b750a27330bd990ac2a1e763b2fdc2b6dd3aa7e34df367 WHIRLPOOL dc90646ecd24bd49fe192b899b743402a298ad1cd447cb6a2c6a94069c218acc353f53b4d22c01bb739fca9d82f62ac74fe827d554cc157295853d53a174c3b4
 DIST genpatches-4.4-8.base.tar.xz 243736 SHA256 70a54851283def9013601bd8ea299c04850410001e36d619fa6e83b64a4f0907 SHA512 fde00c28bc8da96aee2378d7ea36c85a5f8520c271e0251c7bc7472cd3c395dc2c3f5168f38b1bd10e6b5189bedc8b10780899468a368f8e9be1811bc31c0ab1 WHIRLPOOL 1190d8167c05062a53a7cc66a36310b42f6b90a711a497543b68626e1d6ca3fbc1c57a37dfa2a1fc98ed4f3b1dae5d7e77b74f3d708bc830b2bd5c31fc797b74
 DIST genpatches-4.4-8.experimental.tar.xz 62604 SHA256 35148c3d46a256819b5d214203b7365316694e85a729ddec2e5c229e48b9091d SHA512 e1e5b31d35a851f446645a2ac403ab238d63fb540e8443d36a30dd8a5d32016b077c4cfdcb30976e5facc511c0a6116037efb0af0a4840e00a1d8cf6be3fe310 WHIRLPOOL 4b65738d20969d5098feb66e416af450f0be87fa8c1770381165f70ca99e019400ff9e92c92d8f6dc1b641f4a400fa6165f0573aeb68ecba05f8934a348e6cc7
 DIST genpatches-4.4-8.extras.tar.xz 16284 SHA256 50b6dc7b842191a49a77d0f54302ebd1c7334e5f60cccc91e2a02db51ae074f8 SHA512 478e31f23742a99e4b3a2d24c93f0880c1794d40e5b05b80cc472ce237e14f28a83cb31554b686c8ec78e80b776fca363a1aabe450add7a3142ad30a4b586841 WHIRLPOOL 2ff0a37edadfd391b59bbe5158c463ee4b411fcd06e8f5bf53f58b19f88a564a40fabe690d5ac12f108e02d3a001d8b928372aa453f060d530ff2e30d0617113
-DIST genpatches-4.6-4.base.tar.xz 107012 SHA256 a46dd5b15d0cdd327266cab2d20bdb40ed6659c4317bf6c29ac4dbe69f5a2977 SHA512 b123b2739fef62217fb6f4608475654f8c525d4accfbd9b84145d114c9b8e216aa83e0729c6a066167ab7a69e59f5260d3d39b57891f29ed99a0d2a740d76e99 WHIRLPOOL 6af056f77dc8036c8f41bd861a6abc989246dd461b2df6bb568ab5f42679dc3ed8310560718697e840adf1f7438be7b42a4a6df04958b1d8e6ed9f8a5413b927
-DIST genpatches-4.6-4.experimental.tar.xz 4896 SHA256 a982b90888267511036037df15bd03530fe79b60fc15c68ef68100195c0c02de SHA512 a2c886b16744637d4d7b0464835c5d2b8efa07f485908a802021b0e3f9601aa141f7fd9096f700b498bf6cdc3d3f9b9133309f6c72af880284f95cd1f4af779b WHIRLPOOL a5bbb7a687c394adb9f0ac9a866bb84f3092ac665ea8a809bd35748c93bc215c4109af2beaa2fd24a5695159104d1c54ab599a68a2ec92b57d516cf2d995a078
-DIST genpatches-4.6-4.extras.tar.xz 16292 SHA256 3c6ba4c5c30ee786c0909aa0f8a68f00c15584eb52ab91ab01810be36716eb07 SHA512 7f1a57ffc8c7e432f46cdf28b97a44207a77fca86231874489c82a01652ddc7e2027a1a8c3fbd53dc36a8d302faf0bfed123af367dac173df215598a08548ab2 WHIRLPOOL 94179e36ac0dc1bbf8d402cf7a7f40d37d53129a8211f59a5afc43121be3b698aedd297bbbb0e04a5d488398cc1c59a431ec5d048b040d3f57bb817392a1a915
-DIST genpatches-4.6-5.base.tar.xz 115176 SHA256 b796ca7aa71164f1cbb077d34f158b3756d978944e3bf858c56091d2ed9bd2a3 SHA512 1e3ad1df5da7eb67c2c7c1d491c1fe893b99adf508c61cb9a8837199aac237756f41cd5d95b787d7166b456852bd832504daba78d89d48f1e9a7cde66618b2d9 WHIRLPOOL 93404b230f47594f54db7866b3455a0c3015165373ce9d15778d72a7d2fd5e9830ecb7be8f3ebb373eb1a7c61f83d2b9d6d6a9b884b5e8c8b46f0a4266f65a60
-DIST genpatches-4.6-5.experimental.tar.xz 5036 SHA256 79a0f5d0dc78229a42cea0cc3eb3798e9edb16ba992a5b84b651887b6bd7cdf9 SHA512 4e989bb8bb2821f2efb67c8f6b723989b1ec8f75b2345d06adda6ebfd4cd69edc42ea45ec5541edfaed5649a5ac28cdae60c30df43a7e747319c14a02fa8607d WHIRLPOOL 5df3e279d49cdd139906f72c81925744e5eef6bc1dfd4588f48a118f6612bf8c9e6d23bc249edd5ac57ed4b76d960f77eaf935478cd7ed02319aaf45f61210a8
-DIST genpatches-4.6-5.extras.tar.xz 16376 SHA256 07b7ef68c9cd60b5e913c4a0793b7a7bf70e4324990c49df8420ab6017140871 SHA512 053deab96a0c481deb447a8a427a3c321312a61616c5ac7dfe9c5a3fc30369848eda5e4606141839cfd79a5ba9b88e206bfa1a7056af6d4886c5289d997edd8c WHIRLPOOL 2f290ed641745b89203d24b7fe9b7964704480e257d3d618a12ec87ebed9f0680be65b80f569073d3085f0009f8986f4878f7c8ad7bcf19b697382a0e275ad62
-DIST genpatches-4.6-6.base.tar.xz 171880 SHA256 a45e224100ecc8586a9c72861bb64ad98be2ef0ed06341e8d186d0cd60ef6fc0 SHA512 c64470416bd9e432bdc781a56731c7d8eb02130ac4e5a30dd21a837bfc16e361c7db1d0b2b2b19becc5e6982e11c1f619d3982975506337ac44d4daac6c46c43 WHIRLPOOL 480232a11440a2e883b84536dfcc89d3ae7fd9e7cd3794762b1825e892167c1527e5597be44080c9ba8ea366d175bc221362fbfbd850f5e39279d9ba81234acc
-DIST genpatches-4.6-6.experimental.tar.xz 5028 SHA256 55681fea125c614906403abfb690cb22695855fddfc2716da70363789cd57f99 SHA512 795bfee209f9774a68195f4a19f791ce24a7ccbb02c4144c674cc227116407e75240c37ba2f255eb8a250fb4efc82cfa829b9543bd0af1e8bdbf550038d87dff WHIRLPOOL 021bfa8d322f00be1bdd2c48357ddc276ba88139dc74615e7726b7b23a538640e1367600de2a76d5cfec74a4bd9e20f72521cc50b3f7651a79330ff62ada11a0
-DIST genpatches-4.6-6.extras.tar.xz 16364 SHA256 061d2094e28be6d1048ebfa0aff3220bd76786257d957f7e56176f4081229855 SHA512 a82512c71b31e975a5290746c58a89135c3c106966c327bbd9854d011fa850592a086d53527c0e98a9b4eabd40c0e62f3a1eaf071edf0e9fd98c37906e0ede81 WHIRLPOOL 176eaf5260f077b581dc178b81bdf21cd0f6ebbb4258706cc3895ec786fad470ebd66a1596be168c38bd803aa4c91f5b87b7248d80696aa11e322e1a9f3a4254
-DIST genpatches-4.6-8.base.tar.xz 199204 SHA256 6cc99bf90f8d28460426cc2b2748167f6e040d3a453d5abb51e962e8865f2c59 SHA512 29c4a39bae68fdd75ac59f23f90b90da62d59d8d1ad5665238015a9c08ab159f619cb8488fd8b76adcb512f214b27df9738ddfda9a70c54ef23497221f3db689 WHIRLPOOL 0c679f810b4618788185098529b4fd798a65ee4ac988b603db9b5a7c880dd1d35b5e72d9359d7351a4306eff6a250b0e0d52e7fcb2265269c528ff4615ab1938
-DIST genpatches-4.6-8.experimental.tar.xz 87320 SHA256 5ab4451aebba331a7277e6c0420c9135c962c5e49b69e3c10f7cf6d0d621ddf2 SHA512 e0a749c51111364115f42b605996f6910566426727eabb6e85ba00f10001d000963eeabc732622fc0f219afa8e590f071c1f90c45d5432119abb5ada7e4dcfd0 WHIRLPOOL 0a111f9038ab1f0c583954690e543d7edd2dec906d8ad028897c3b3f307e76b337d743c0d24a3f8e4d6501a421f6200455a5a76dc9039e482ecc48eec4555fc4
-DIST genpatches-4.6-8.extras.tar.xz 16356 SHA256 d7d7d862befd6a649023d104af39e53e7f4c09ed6b1e560679ede7e31105db81 SHA512 dc6cc91ceea8773c462326b2f11233fb1bd71633058610132cc06afce33ae8b73086c3ff415056d24fba03c57d5d5f0a2eaafa2eeb52807c17aa84923dea9a3c WHIRLPOOL 138da0553d1aa62b57e4f7ddfeadb9556cdc5964a6f646ac1bc54ba7f0ec56ad58ec112b4aecb96ec3b9153e557346bb0ed7f07a3ce30500e6faf2a69dc6103d
-DIST genpatches-4.7-1.base.tar.xz 3000 SHA256 55ec2087f5bcd466060a057c1bb2ce5b6f4559023fb09b31f2a7ca69b2080b35 SHA512 28bb8961aa32f7dbabc9a25088b66b351b288c39b8d0148bba0158884cddc603080db1049f807a20beb6cdab75442b09a11624cdf1f22a25dc9b025028d2a875 WHIRLPOOL 0bb9c1f0f7472a1c5c22c1610a2c6a64c9b0f997f1a5bab0f1a1ef7d51025ae5b7ba91543f6d679dd261ac3c8ba178f8e4e7fc514ca69d1696325bf284843177
-DIST genpatches-4.7-1.experimental.tar.xz 5032 SHA256 4aa6efbf46c295d276cfc5554b957b69f8db0ca194f90be31e648ff8992febc5 SHA512 91f0ab766270ca05ac2b94c4d93be977ffebd2f8011bb36669d7073a81526bc586e195e109017cc9b15269e222e1f6e316004abd9bb3f9f309d0799056909ebd WHIRLPOOL 461eaa66bd629fae87ff0614dad96f8df1df519df182ac3c3c2fbbc011b7350bccce8213ef59ed727a33443631671cb46bc91ee3f82aebd63f1730811599767e
-DIST genpatches-4.7-1.extras.tar.xz 16360 SHA256 61ea55475df5d3b4ff1a9e485e26105c2f04b9a500d48e3ab7ca0cc49cc80fb5 SHA512 01fe6e6f34e31520d71ef47a326a91cf381e38e1b1a215abdb7067b8b8cd08a35c8a799373ad48fdd97efc6ae084e90c4d17acd3953c337c7f435de70ca57b8e WHIRLPOOL ce8957e26e49e140b1bf943476c36e1b4c5dd118d9a3c0ad40f292db02aa5aa66fd618546c2a4c1a92a5035e6e2feaa56146d54fa9c5c43d0226a57dca930266
+DIST genpatches-4.7-4.base.tar.xz 113672 SHA256 71d3410b6d4867e459ea027aadf2024efdbc9fb78ce0180b47245b69d34b5d50 SHA512 761c306e10eda7482af8f06a1f29e42a4059eee0b8949a03068b20a0908a2c873ac753eaa12164e9672f0befb7361cffc6f0c1683c6c280a983ad8da80b4f02b WHIRLPOOL 93c7394fc66d24f27f8c0690a3626e7ee6aa0968706c26a719e66d5732436bc2ac1260c36086530505517bd81d1d7df8a1eda605cbbe0bb71f3b2d25e96b3476
+DIST genpatches-4.7-4.experimental.tar.xz 87060 SHA256 61ef0410e8e4a49841e2eeb7c5bd0813263816d777a3bad5c92e92e23fb4b249 SHA512 bfda1bac72e1d9aec106369727620565a4ba9a1968e8cd7223e317328062a577b43dadad03b067635d0bfa1bb625606f545690e4bf5163faa9359bfe5d211860 WHIRLPOOL d7501b85ef5602bae04fc4f8b8bced421dc8cd8681f2efbd82b45a57468fa2b970e5a20c6eadfb3c536c74a821e7d8ae9b4713d5c98e69cea2364d77145fe076
+DIST genpatches-4.7-4.extras.tar.xz 17604 SHA256 dfa04eb0b3c9c6abd370231b49781252c914701b5ab7477196a2ae42e894525e SHA512 5e32894dad2a98943cfcab7699561b042fe99acfd4fb6159e04a26af49019a4b847fdc53b8a4e37c194b4c64e491849c3837149007bac93bd9a2cc8c13a9f45f WHIRLPOOL 2da8acd833ac526ea644890bc578f06f78816cd0db7f67311f4f9c5331b446e001ccbf276f5fb16d1b7cf7d605ebd861f4f4432c244f38658b24169242d101a8
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
-DIST linux-4.6.tar.xz 89461728 SHA256 a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866 SHA512 df5ee40b0ebd89914a900f63c32a481cb4f405d8f792b2d03ea167ce9c5bdf75154c7bd8ecd7ebac77a8dbf2b077c972cbfe6b95163e27c38c1fefc6ddbdfa0b WHIRLPOOL 50ee28a06930ffb29ade1aa5fb4e3bf165ead92cb660dc6771a265cdbc2240713ebf14fe235fa153d8b6e3ab853852ea06c2525209cd7989aa3d6f6fad5b7edf
 DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.6.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.40.ebuild
similarity index 76%
rename from sys-kernel/aufs-sources/aufs-sources-4.6.4.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.18.40.ebuild
index 4c8e90ef1249..6d91a628b223 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.4.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.40.ebuild
@@ -6,22 +6,21 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=5
+K_GENPATCHES_VER=40
 K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.6_p20160801
+AUFS_VERSION=3.18.25+_p20160822
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
 
 KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="deblob experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs3 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
@@ -29,7 +28,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND="=sys-fs/aufs-util-4*"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
@@ -43,15 +42,15 @@ src_unpack() {
 	fi
 
 	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
 
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
 
 	unpack ${AUFS_TARBALL}
 
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
 
 	kernel-2_src_unpack
 }
@@ -66,8 +65,8 @@ src_prepare() {
 
 src_install() {
 	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
 	readme.gentoo_create_doc
 }
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.13.ebuild
deleted file mode 100644
index ac01fb23669b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.13.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=15
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160627
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.14.ebuild
deleted file mode 100644
index 7a88beb0b5d7..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.14.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=16
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160627
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.15.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.15.ebuild
deleted file mode 100644
index 2dc837de9e06..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.15.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=17
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160801
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.16.ebuild
deleted file mode 100644
index 44bce5266507..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.16.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=18
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160801
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.17.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.17.ebuild
deleted file mode 100644
index c81615099b6e..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.17.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=19
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20160815
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.20.ebuild
similarity index 97%
rename from sys-kernel/aufs-sources/aufs-sources-4.4.12.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.4.20.ebuild
index 5c61ac55b2dd..8feff64082f6 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.12.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.20.ebuild
@@ -6,13 +6,13 @@ EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=14
+K_GENPATCHES_VER=22
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.4_p20160627
+AUFS_VERSION=4.4_p20160905
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.6.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.6.5.ebuild
deleted file mode 100644
index 01c92bc6bce5..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=6
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.6_p20160801
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.6.6-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.6.6-r1.ebuild
deleted file mode 100644
index e5fe93a16dad..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.6-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=8
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.6_p20160815
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.7.0.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.7.0.ebuild
deleted file mode 100644
index 35d09237ddce..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=1
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.7_p20160801
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.6.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.7.3.ebuild
similarity index 98%
rename from sys-kernel/aufs-sources/aufs-sources-4.6.3.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-4.7.3.ebuild
index 7bc6bdb307a1..82327106f60f 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.6.3.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.7.3.ebuild
@@ -12,7 +12,7 @@ K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.6_p20160627
+AUFS_VERSION=4.7_p20160905
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index a6ae05318076..9b94e0447196 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -22,6 +22,9 @@ DIST genpatches-3.12-60.extras.tar.xz 18232 SHA256 f4d2c39d20fa358e2b0610a20bfe2
 DIST genpatches-3.12-61.base.tar.xz 1733484 SHA256 bbcd534d2a0e666063e93d47d66441713c3730ece9816dab71e1f7c4ffd7631a SHA512 c51100d6f2beff36f344ec5f23dcd6ccdef1d17667e638376d3aacd7e798850e38eb9f9c2347699472f65c3a6678d16220b08431630ca45c4d8ec2fda12ce9e7 WHIRLPOOL 1fbcc78a7fe73067d865d4f2ee0bd6dcbc54e44076fd54b1ed307e421eb6a550592af9000af9d2c046d4ca880cbcfee586c310e6e3781d032a1677952c7db32f
 DIST genpatches-3.12-61.experimental.tar.xz 46524 SHA256 045e3fb9374e1f7790c65b51b1923840d913af135d02707bfea7751206e677f8 SHA512 b6be2e639c6418f4be1d0d8902e63acfe7af57441d7c38af434a4f4b19af1411335af259d7b56daa2acdc593e62055a6b129a3694aa858f108f882b43811eeb1 WHIRLPOOL 2c79b345703d3f9967141639ac1436de7f8cc8b872b7038c2ef093ee921048cd066b4329459adf1b80a2d9d9361ee0baebe39450280875fdd3965e32dae3997f
 DIST genpatches-3.12-61.extras.tar.xz 18232 SHA256 a7d23845d978364f689368feb0e4f929892c061cbe892fffee0abd44be17f4a7 SHA512 f7dd03d1a32fe399af8c16fc6fa895d240d2077d825f3a8f3360abd4b2b14b9853a94e074b913b096cc0cb3b5a8a6c8c6a585e39274e99204683c3f0e8275b62 WHIRLPOOL 9222f3c1ce4bbee07e10bba12b1da60e946816e2ef299b0ef0eaf5d807f9cff463d75bed46ba8211ebf463a4644c27f69512d58626a36e8affc7ba218fece44a
+DIST genpatches-3.12-62.base.tar.xz 1755476 SHA256 8aeec06527a19c091b173da858687b0c45beae8b58d5e3b7e6fb727b8d64bea3 SHA512 0728260b7df4c94fb7ce833abf18ca0abf80eabde02f6e2ac343eaa803b508553229bb9f9b1899157d17ed1cae47203d8cc18257d9f0b57ca2c975e0dc34b430 WHIRLPOOL 57488efe5ab1685c8a3e1f128a017a88399cca6a79a375124e1cc28cce3764a53fca749fd61bd164bdab8a45ca28225a76767a4a8687faa0054a65befb92996f
+DIST genpatches-3.12-62.experimental.tar.xz 46520 SHA256 f4e18ee8bba52ec8ad7f534593cfc15e868594719cb26033945b5ef9090ff772 SHA512 e11d28f48d7f1fb4ccf09541d306d404b829ef1da90bbdac86dc689c0b8c18b305c0065ad8f74b1fe2dd1490f0e91073e41853a4a935284d53151b56d4f6e4e9 WHIRLPOOL 01e121675bb32ed626f0346a3f9a063db2a9471ee0d129aa87943586f68486f86292f1da14e4388f30a40d919c9a357f562a655b575de242e89160079d70f9ef
+DIST genpatches-3.12-62.extras.tar.xz 18240 SHA256 998da2e9d0d5e5904ae224edef7d3cd06270a31bc2c3c55f8cbaf891280a1295 SHA512 f2c4d3259b0bf78d898013c630315ee8f053a5ea42ca8831ca191bb2ec578d0c9800d47a7384238711e186a85d0f9b750db0e8b4f4297ce989520aa9fb8d53ef WHIRLPOOL 1dc4d344eff9e365843f892460c70820724d2f07b66bdc66d862eacfc31b20306d469bd52da3efa2c1ba1d7a35650e0cd4f1d8967376c924d547aebfc37acb49
 DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0
 DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76694cecb391e4de657810b2de2a9092bbb0eeb SHA512 c2125a73aba4fe51c1efc6a73a86088964bff398c2409e256148d0f13e8106b56e6c8137e0943332be2524b3230f522e0b76b265d20ef075d852a5a3ca21edf0 WHIRLPOOL 5042375ab3541e65f609deb48a03d186b53d583b4512c27ece06130c0ac4fcebeb8256bf9cb38276720e8fc6610dc8663819ec5acd3bdcc57232a1d2082f25b5
 DIST genpatches-3.14-65.extras.tar.xz 18256 SHA256 9220e49d4a95d876373ec40fae2e026bcd76efb5e33106bf2350026120b28244 SHA512 2699115a2a176a34570b1045f1ca6f5f23e46eb974c9c4953607919f7e5668e1b317b197cd39aa375347460110e9c67231b0315eddb9ed4d8fb631b453f802bf WHIRLPOOL ecb98ae1bca845efbd5dc32bfba31268bef55c73ad35092796c8c4d3661a72341e1a179833ef76d701ede477b9d436a2c45c16ca9b2bc23bec413e0186848285
@@ -40,6 +43,9 @@ DIST genpatches-3.14-83.extras.tar.xz 18264 SHA256 4f49422d79535fcc34b1cbde89d5b
 DIST genpatches-3.14-84.base.tar.xz 1310568 SHA256 914aaf12a751db3972493f2221434163ede89e959654c25df82da528c5730a4d SHA512 1f28f1032edce93206824e4ab547a17a29734aa75a83b10b14c902cef1363f9b86c06207f33c7d1c702831d0cf3bebdcb9b1277804f59de595fd4a9336f98c0a WHIRLPOOL 13732b5f6439ae4e3b27837fdfeadbd2d6eefc745f0c8e406d3dee272de0f282826a92ab3d913030dc6b9f96b92655c7c0d3603e282ab59a712a9da6a0d13a3d
 DIST genpatches-3.14-84.experimental.tar.xz 60300 SHA256 97498bdcc6f8d8e001e06c9e9a2ed36761268eda95000bbd49a70760c1e3c615 SHA512 6c0a19f397619d7cf022edef2e645f86670760b0266ea8580036dafa2a9e59ff7a352f3727baed9e0a490abfd24a1a003fe97fcd46e5b2900cbd4f6f36ba6e58 WHIRLPOOL 5d39e7fadfdff5c9b362f94e55ce5a0e9aed3dcaae84a881c5cf8f23f29f3aecce560cf44efb2d9554b57248976a30fb5e4dc08ea9b03eac8131d904a7b6c0e2
 DIST genpatches-3.14-84.extras.tar.xz 18264 SHA256 4f49422d79535fcc34b1cbde89d5bdb4a44989025aed3c5b1ac94af72ce5a543 SHA512 39797b9d1dabafbe5f101899212529e95ff0706f439c13ac309859ecc0621373faf2d53b533895d3ba7f103977052d80b2578cbb4c551bf357dcc9da51c7421c WHIRLPOOL ae4b3fba3f53627df79d0ac2fccde146caf370002b0a2e7cdea619bdf5a59883de32674a65a019c3f1fe2e7b36ae4ce9e4cf77a6a3b54f8625858e790c25481e
+DIST genpatches-3.14-85.base.tar.xz 1319540 SHA256 b73207d1307fb574534c2eb6fdd506c08a6cd95a7c51bde805171decb94f1ab5 SHA512 bcd8e94e8866bc911cf42e0553c41c0f1beed0c4901295561edfadf8f17079fe95c27814402c749a6eb85cac8de33946d2f01eb8137540388e4f9877ae4ba1b3 WHIRLPOOL 9566e190b6a814cf06365a26d1c84d29979e865bb2e17a67cdabbfc07e14cf703c0e4eafddabc21e32f8def8f39afec6e15294b283c34435e794f9c73e23e57d
+DIST genpatches-3.14-85.experimental.tar.xz 60292 SHA256 2d73cc266e4c0f9e10ef348d932d1aec446735c7867d08425db8f2cae58d8206 SHA512 5d7097a362e7dccb793d9eda1bd6e7259f84097b06a0d3ffc08eabba7c2040b430a9b1ef81024ef0bbaeeb56063f807690d2c1ee13e2b13159c6e439fe8bc63e WHIRLPOOL 3ce42e677d24a9cc131d7a4e3b9bbe9e59de8674d6effe52d1a8bfc46c137d190093044eba4fd11a5e5024a2b0f418d43a83deef72fb4aee2b0967b6da8ad32b
+DIST genpatches-3.14-85.extras.tar.xz 18260 SHA256 124d55a0f0fb8c269124b32bb8efc9c963099b55db7c72ffe29981b1972d3744 SHA512 98eaf30ce65876f95ac4e877d80d1d338736cb7d4c52f0a0dab63f3b54e05de9ee8bb66ea6812bd5da4a9e1ee88b80032be44d137cbc25542f6f40014a21aad8 WHIRLPOOL 7705e270399fce0e8a9ad1bdb4951df32f17c10bc7ab80289e0cf03ab267298d207b49c1b96b19a09176f2ebc40152c32a0bf1196d4b88279d0e9fc25d5ecc1f
 DIST genpatches-3.18-26.base.tar.xz 753528 SHA256 0a3d2a302b64284353accbff19ff1a78128e900f0d4cbb0e70920034b68b4bba SHA512 723a29074dbd6970b43974655539902a92b5ba3447cba754f5719971848e2d2ca450d888a83d41fe35770806e842615bb5c5425aebf8a7118e5cd39470aafcac WHIRLPOOL 17e49e01f19a9710e6c3f6b6bb3b50ab96829a18dd60a57eb10058656845ba8e497ba4c3043f3824d69f79cb5c911c5fab6f4b8e28aa39acaa5083fca732dad0
 DIST genpatches-3.18-26.experimental.tar.xz 61608 SHA256 e72de3a8865519ed658a2a769b42e2b4592ba5a6e5c98a699fbe4109f3567532 SHA512 75cd10ac41180cd5f4a1e70ea49b260a141b875f3f46dfa5edd668e507b27fe7244033c76d1e895dea58c8fc69c43ce21dc8e711884438c10b686d53c0b4c8a4 WHIRLPOOL 267a2c1abcda2d41ebf64a6034c60e73249dc4c0984326f516ac92eb16145f493549e690bfcf8f6c515984ab56368437e392fba3648f4bcc57db0351d5ee6863
 DIST genpatches-3.18-26.extras.tar.xz 16188 SHA256 af0d5013a7cb6e0ec78bb5821bb4f83048d953cd10734b57085439fcdc44683d SHA512 effb9ef5722a956a9db49582b3c8aa85f5838a8573138ce867e0575348a291ccc6163e7bb8ce1698f9b5d799e81e151546c1bad59388f80b984e86f98ee8424a WHIRLPOOL 52adaba3ba161e7d1bcc8234edc9efd06bedca2211085990069b1ea8e1a35ab443e5ebfb49a7d56c3d572f9e7e69de1bdfc463abf455ba7e3155eabcdff3786a
@@ -75,6 +81,9 @@ DIST genpatches-4.1-37.extras.tar.xz 16364 SHA256 75c430b9e116f643141d7f8b0c5d92
 DIST genpatches-4.4-21.base.tar.xz 618108 SHA256 0a0d827a0b6827693cfb57836769e4203fca266eda1b0fa27af552309e114a9c SHA512 ecae0f9134b2a0a1d469241aa9ef218910b780a875137d723cd58a1159d71e813a447690a2a94e4fd4ae11b862c0a4f8344d1a03f6a185c8f57ce69d55cc4546 WHIRLPOOL ae14e0b1b9935f9f176071c7580d1dc4a2013cb4005501b5da2f9c6e9ad0a0697d61c13de924aaee20c3f271d9802e65faac7fa9db14911de6822b399e6af0c4
 DIST genpatches-4.4-21.experimental.tar.xz 62768 SHA256 83702ba81582a25708c1bca6588c8f0b0dfa212b000f3db8b5843c0b5c9b87fb SHA512 c84b442a039c0aaeaee9234b83f44d126eb3c6e89ecbb2020f19dfaf2b2430e4e33c3723037ffed332094ed329973d2985b502ff056a7aa0a9ec815d03384655 WHIRLPOOL 08cf3ae7b9914926767a47c9395c2c28bfcbea2887e5830b7d3f6a803739e035b885ece39cdf3f25edfedfc259e593c9e3ddc9fa8dc2dd21182516cb37112445
 DIST genpatches-4.4-21.extras.tar.xz 16360 SHA256 afd5c30f601ffa3c826679eada3b497e649c174e53cdfb0e029336eb9fe51d4b SHA512 cb1d16b21892a5ef1176ef398ef15ad5998b59465398f226aea77c116172a71cedac2a2a5fd91674dca9905b18c4e4069875a9012d2d15ab05465f0abf34b8da WHIRLPOOL 8f63bf488c88bf8332af7512ddfecaa4f274c24be3f5c12ef69b34c1a57d980705032f2926c6f0ddcfbd3dd634ead7cc68914fc8aafe65df739e4c26d25fe660
+DIST genpatches-4.4-22.base.tar.xz 644548 SHA256 5baced2ab2eb8b511d8c6d760e1fab1048c4b4a08e0e317e9a02815143582e08 SHA512 aeb751aad975c393c32be7dc637aa276308a296bed15a7ce825d7f6e478beae5b5cdfe728ede25f7e3c3e09f65d2f2490483cfa0abcfcc8a5607606cdbed6d36 WHIRLPOOL fbaace97e76482bf1cf69d4069b07aee317d98e50b894aeeefbaa5bf5f4d001727ce819a8a28c0555a35a9534f9fb8c8f3740bbfbaabb8cd46f656da68da8004
+DIST genpatches-4.4-22.experimental.tar.xz 62732 SHA256 bc2b45d3a36864d3867d7732d98efa02045da605677046519ffd62bcbbacd592 SHA512 20f00f35eeeb1b4592430275ca207d0217b2e70ea469a655e05df14147ffcaccb94c5c4229a491d6b68d4d19968e601ca78173dca8e39620b07179b1a59817a0 WHIRLPOOL f3d3763cba232be28c5327857b4da6b81e9ee4ed3d2d263a9742ff9d5278218bb78b2671307bf30c39fab9718a5f1110d131dfbaf534b212efcb41da40ddb3d4
+DIST genpatches-4.4-22.extras.tar.xz 16360 SHA256 a3335977ecc84df581ebb7dcf40fa342ff1be0a99a42b29d13fe3a1fc88a0cb3 SHA512 7ca83e63bc52736fe6d465d231a3953e02f9430a9c78e87ef114ddc19cba6abe2c45bc0cdf82c833f0b750a27330bd990ac2a1e763b2fdc2b6dd3aa7e34df367 WHIRLPOOL dc90646ecd24bd49fe192b899b743402a298ad1cd447cb6a2c6a94069c218acc353f53b4d22c01bb739fca9d82f62ac74fe827d554cc157295853d53a174c3b4
 DIST genpatches-4.4-8.base.tar.xz 243736 SHA256 70a54851283def9013601bd8ea299c04850410001e36d619fa6e83b64a4f0907 SHA512 fde00c28bc8da96aee2378d7ea36c85a5f8520c271e0251c7bc7472cd3c395dc2c3f5168f38b1bd10e6b5189bedc8b10780899468a368f8e9be1811bc31c0ab1 WHIRLPOOL 1190d8167c05062a53a7cc66a36310b42f6b90a711a497543b68626e1d6ca3fbc1c57a37dfa2a1fc98ed4f3b1dae5d7e77b74f3d708bc830b2bd5c31fc797b74
 DIST genpatches-4.4-8.experimental.tar.xz 62604 SHA256 35148c3d46a256819b5d214203b7365316694e85a729ddec2e5c229e48b9091d SHA512 e1e5b31d35a851f446645a2ac403ab238d63fb540e8443d36a30dd8a5d32016b077c4cfdcb30976e5facc511c0a6116037efb0af0a4840e00a1d8cf6be3fe310 WHIRLPOOL 4b65738d20969d5098feb66e416af450f0be87fa8c1770381165f70ca99e019400ff9e92c92d8f6dc1b641f4a400fa6165f0573aeb68ecba05f8934a348e6cc7
 DIST genpatches-4.4-8.extras.tar.xz 16284 SHA256 50b6dc7b842191a49a77d0f54302ebd1c7334e5f60cccc91e2a02db51ae074f8 SHA512 478e31f23742a99e4b3a2d24c93f0880c1794d40e5b05b80cc472ce237e14f28a83cb31554b686c8ec78e80b776fca363a1aabe450add7a3142ad30a4b586841 WHIRLPOOL 2ff0a37edadfd391b59bbe5158c463ee4b411fcd06e8f5bf53f58b19f88a564a40fabe690d5ac12f108e02d3a001d8b928372aa453f060d530ff2e30d0617113
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.63.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.63.ebuild
new file mode 100644
index 000000000000..ae8b6bf928ca
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.63.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="62"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.78.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.78.ebuild
new file mode 100644
index 000000000000..62e06a937bda
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.78.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="85"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.20.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.20.ebuild
new file mode 100644
index 000000000000..a5521b020972
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.20.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="22"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index d20ae81ddbb9..c3c77fd5dd01 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,13 +10,13 @@ DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f1
 DIST linux-4.6.tar.xz 89461728 SHA256 a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866 SHA512 df5ee40b0ebd89914a900f63c32a481cb4f405d8f792b2d03ea167ce9c5bdf75154c7bd8ecd7ebac77a8dbf2b077c972cbfe6b95163e27c38c1fefc6ddbdfa0b WHIRLPOOL 50ee28a06930ffb29ade1aa5fb4e3bf165ead92cb660dc6771a265cdbc2240713ebf14fe235fa153d8b6e3ab853852ea06c2525209cd7989aa3d6f6fad5b7edf
 DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98
 DIST patch-3.10.103.xz 1332092 SHA256 ea9a27fd1644f6686098df421623dfe772d320c926e45f9edf97f0b305774353 SHA512 065028288f416ef8334ae32c8c5b3791bd6135658a18f90982100c2247f4e9461fba76b6015aec9500f47aecdc48d7ed7539b65c4285b4b0e42d97e6c00dba04 WHIRLPOOL 12b59a9bf1430c2a4a990a302345e8c0dd6c3239a53e25e87f49f9b5dbbcedb776aa7e8a42a35979d28b14b08f438c73363fd13878e93d262c4ddc38f6b6a848
-DIST patch-3.12.62.xz 1590896 SHA256 ab588b29467b2924a232d0693f6e79217c5a8d3e373f037f785ca0d3ea027617 SHA512 d5b049c0898ee42f59b14d5f358fc3a0ab2f820ab31dc62fc1cc58a4f6d9a1163af0a01f30e502e49561d6095c0ba981ef58cb2c563c3d565f0a4016bb529181 WHIRLPOOL d89b4409c09969684f854903d1e093bbfdc2653e6f908152381725382742b5de2011ea4c35dfa74c5b98fbe534fb4a61cf83fed50e21c24c096c0491402af159
-DIST patch-3.14.77.xz 1211600 SHA256 07c05cf431d1aa8b60c6bf1782558720030cc1483edcaa3fd83b05a0431ab5e2 SHA512 7ca35771b45b8f334d5bc7e23ab24b30bec3ca62a55c5dc87546c9aa0869c43848c2046d285ee88f24310e7e55821c26fa95e09414d31d19aefbd8159b6d721d WHIRLPOOL dc927d78339c119fb750c20b58a82b8aa72bcf1907f9b10ff6636ebcdf508acd3d170e89d02ac6acda7a3e14bc459581a63c4edc4d7a98045cb2e25297ef1206
+DIST patch-3.12.63.xz 1610112 SHA256 35a673ed2047e042636b56573020755f5e5d1ab63bfe391180f2f1f4940cfdf0 SHA512 dbc96441bbdef78fadc744352278c9ff89e14b995d10eb9ccae9767e89bd2b351943acc305384e825976d992551e6f2cdb791fc7d65a9e090fa1c66ea2e5c751 WHIRLPOOL 40adc9b359a30d82d259839f1ba49ed801e031b095eac8f58c686e540c70a27158ec3396d908f938990557f31ba258ef454d19cdbf1b26016621dfcc33492808
+DIST patch-3.14.78.xz 1219704 SHA256 633f65fb99fee04cb20987d1d12aed4973f115e1e8700d7954048791445c0463 SHA512 8801fa5dc2773990bd85c7f10852dbb1e7e33239efc001f17171b3fa41d6cbc2f8c508b37b5881b0bd4466169eb3f8f49d3e2bbeb7d48006c056990a759bee1e WHIRLPOOL b783908d99f293e637313b918f28d859fad875428c65c478be126adf3e1a36a8ccdb2ced08ef77c782b3da6c5cdf232069fe0fbc56bf3e7f297449fdc9ceb47f
 DIST patch-3.16.37.xz 1300688 SHA256 9c189e8099df0eece273a7e7b5079ba3f0c73e1b3e25ba341c316bb0003cec5c SHA512 19d58c858d00137fb02b04bda8491d7e17c0fd517dc7d8055d060f39dcce30a32407ff59c0b844c79e4dadbb9749f5b18223b71c6a9531f3fb08ae16acc2cbf9 WHIRLPOOL 9a6e3451e75e20e168e5de2186a8c9c743a160c8caad183d63467101c3dd2bd3cd86f04dfa732f97696eb48486d60cb3d40196aef6deee58e8d8b5a021cea67a
-DIST patch-3.18.40.xz 1026848 SHA256 6fb91894df78bbf6e2c6388a905ee0a5615b4337853f05f9319584ff8d98b908 SHA512 1c35602b776845aa9b71889e56fa3d313235d39525403e856b1a01eb62d777a5453d7bbdf6187e8faed1740760dac0fda800fe8c3878a3211cc18a8835b91be9 WHIRLPOOL 8d6853fb6aaafe3f2cea14491c8a24f807570a9986656b88f68fdda5ba4117cbcecce304217baa1c1f4df1c085ad9913a2661347321ebc6383b0a7f6aee0ce63
+DIST patch-3.18.41.xz 1033864 SHA256 55398365a40e6d992d5bf0472b0420e23665b22da31a8b587178e571c6b51eed SHA512 5ba00f807a336a272170112734363e9f877b4a91ae45d25ba732ed59398084c73aa25e6094776a0d88fede1fd1b406317a728f6028ee90398aa47fd5c6a1d266 WHIRLPOOL 9140c1d829152134f1c5f8df9149de8ea0996910440f0d7db63ea01873e1d5e44acdbae444a89e049ec78e7f81b22ebc97689fd0a505408fdf38393c20165319
 DIST patch-3.2.82.xz 1619680 SHA256 f522e0abe63dbf477389ef17e6e9d2646c51db5b9d9511659678749ee5907297 SHA512 8b9da8fcc959761c8bbc593fc99bc0880068e648670df420fe8e7e5a036951cdcb8d2f5f55f74e0dded34ab15dd1d2d142340ac5a54d2445b462d85ebbed4d7f WHIRLPOOL 8e815e88221686084589fa1b6359448cf6858be2e387a72a101b456f88e5c1b53d5d738f2db2618b361fbc91f1860837dd9dd3b99fedfdb5238e7a45a5896441
 DIST patch-3.4.112.xz 1337588 SHA256 01d33e0582be65f75835599ebf659f46c0ad0b7f64b826c78e5402550f2224c8 SHA512 474bb722b4c5adcb81d73df2091f4a0873be01a7f287a34bed7d68b134bcdc8dee3ef7a658f2e9f0e3572bb1ca83ed8b06ece31346fe3685476a1fabb9bc0a2e WHIRLPOOL 5bb15bb566ed73dc5f316d2e57b655733de4263c1bf78f2af61c34097cce49ebf5480d4dffff4748e5725a7ed83dac4230a083135e30b19379ec05ffd84cc96f
-DIST patch-4.1.31.xz 868196 SHA256 a6d393ecabc26368e333e59423cedce4d12068650610f9391db6f09394d4f65b SHA512 5852acd91a223b3f2e959de16828db561f7eebf7a4e547d7d9e202219d9e2768d6c7bc0fcd6b9b95b601a04121950bdcdcd5840785b7a901984e98608be1edd4 WHIRLPOOL eac3655e22f17390b7c89505849d3fe2cf0e2973a162eb81a44a98052c306aa37c8baa8a7ec4a2c18daefeafda7a10fe0ce8a177819e031275aea9e6bf9c7b87
-DIST patch-4.4.19.xz 589516 SHA256 61b34a8ab4ba778c50a6fb04471cb34192e179db68440d81b12694e45dea00fc SHA512 77b0bb79563a918a92506c26e14bda26860aa64e9c0247f75b51c945a6c7b45a965ae54baa443e03f7d2075bdae31fad6bd51fb740d85fbc6498b7bc8f9b2772 WHIRLPOOL d820360bc0da2205096583cf491f99d2271c30ccccf96c7a2f8b267975ea9f439b8bfecd17d9807d4ac4b6cf7488ddb0f7edad4fc8ed839c3f2522c94b01db09
+DIST patch-4.1.32.xz 877592 SHA256 8d29b0fa288db7bdad6ca34f06d5656e641578465897d426e0242cd155471db7 SHA512 cbcf8e8e6ce3b439772185a79b46a6466a5d859015fbd4d4f49ee3b3291469de28eb24d3180794f46edb842a0b79cf3173cf5f7f55ca41c35d101ae656261615 WHIRLPOOL 95186e1b6dc6f21cfae46770e8068991faa7ebe217ae2e6099969a3489cbe6d08a2603b3109d977ff90f83b6ff67353a5d3999638a36fba45b7cf21578c4a361
+DIST patch-4.4.20.xz 614364 SHA256 da9d7d3548070bc4a333786778f628eaa2a76e10f21a34567f591834a9e87d27 SHA512 551c375ce851304edbf8969e104e4d5b570b280a90ef5502f560dc482f6d8140256baba057ce4ffeea1a9338b2775cc1dbdc9a5f2acdf630c78fce32932deadb WHIRLPOOL cab16cba8240fd1da38ee7fcae5e41dbdb5aa4908eeb07be2aeb7aba927a1e93378f89e69c6a7df8dd1f356f1784e5f6995ffa70703151436d562268fd1fbd46
 DIST patch-4.6.7.xz 210048 SHA256 e06e9f84571856b02eb5c1d399e120a7ae8d618e4b444009dd53c9ca8f89fa11 SHA512 8b63eb1e7c830bdf59aefbb02c591299dd8088845532612ed6b91b52f9d645e78d8c47d8d596245b877a4b7fa247ff7b703d433830cd36331c546628761a8ace WHIRLPOOL 6ccae788a165292ebfb75853b94c04a609640093389877010c29e4444537a48fef0de157f3d98c802da1224404ac80903ecb5a5da6d1f0d88e5d556cf7fa9e5a
-DIST patch-4.7.2.xz 74012 SHA256 031cb0e7b86f2ef2cc4d0dde9d73495f68e8d23e4c41f50f7f95b065ee33a71d SHA512 e05ef99e047b6874ef3978355c46cf38b7cb9e601af07be4ac12459a58152ebd6232e51f7f1263b95513ecac8aa1ed8129c09f2e298dd833195584ed9584b25b WHIRLPOOL 4eb51b854e78a9c5420dc9f8573aee82b9bd14920f7c2311747314ebc8fe509954b2b18f2a39cb2daf87c4f85776608e76a727a654260229839cd6a80064cd4e
+DIST patch-4.7.3.xz 109896 SHA256 826b96e794d325abf430e8d6c3279a21e97e3ec321a3962b9dd6966693b14d88 SHA512 f2cc5d72c3d923dffb7f89e8a90bb30f3a202a4c353cac7dd693c65bfdedb81dd9882223ca1fcb613c75fc8176e4f8e7133566455631acd6b0b85a521cf8ee09 WHIRLPOOL aef2029a1145153700445515f87404ec0fb3c326ddcf22d22e5308c3ec6fc6bb25bbc7ac14506158a8f2f0d3e0e4cec048cb30d768a402ff64923288bad0862e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.77.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.12.63.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.14.77.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.12.63.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.40.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.78.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.18.40.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.14.78.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.31.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.41.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.1.31.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.18.41.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.19.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.32.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.19.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.1.32.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.7.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.20.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.7.2.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.20.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.12.62.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.7.3.ebuild
similarity index 94%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.12.62.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.7.3.ebuild
index d8dab37130e2..88af46c0981f 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.12.62.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.7.3.ebuild
@@ -6,7 +6,6 @@ EAPI="5"
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="0"
 ETYPE="sources"
 inherit kernel-2
 detect_version
diff --git a/sys-power/cpupower/files/cpupower-frequency-set.service b/sys-power/cpupower/files/cpupower-frequency-set.service
index 2d9ef35655af..8f2f4d9b7628 100644
--- a/sys-power/cpupower/files/cpupower-frequency-set.service
+++ b/sys-power/cpupower/files/cpupower-frequency-set.service
@@ -6,4 +6,4 @@ Type=oneshot
 ExecStart=/usr/bin/cpupower frequency-set $OPTS
 
 [Install]
-WantedBy=multiuser.target
+WantedBy=multi-user.target
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 8149b27f5ec0..b7b47e65df1a 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,4 +1,4 @@
-DIST moodle-2.7.15.tgz 35007649 SHA256 9c61c40996157be0498ad0d5004014b77a5fe34599510c76f7dc1ffc95c74400 SHA512 deb92e394bf0f0a06246c182d5411727f0fc07d6cd1defd2f8773362990dd45351bdf31fdf0494a0db95ffffb9c96c1120546891988252cf19671cf19177cf05 WHIRLPOOL 0feba4c7d49d9d2179674e0199c20547c841886e6b3f2b9a2917cd5829ab1a00c196c55e175e8e8300177592d6278d93af16094c90881dac1c6d0ac3cd392e59
-DIST moodle-2.9.7.tgz 36586018 SHA256 87261ce872ef7bab3c04a4ae28cc41168af2d5fdd1c35bab6aca02132e3725db SHA512 1be555fc1e8cd948180dc3cf055c998290821e4445d534461228ee6a51758992f0c0572b0068452f1dbdcde6fba405370f6f44818dd7759e75850abb73a83cb3 WHIRLPOOL dca9a276bd863aeb3a48636ed0bf575cd47ddc11396136b3bfb4c779845414026311f4caba71ba6792b433b1b92cf7c880931c63da9e1c9d602f82f2204586eb
-DIST moodle-3.0.5.tgz 38156153 SHA256 e8a6a3661e036b3cf0b6d89ed2a6af5da58561e1a94118512e92cab39071ca97 SHA512 c78f68b234889d811a7c69caab5c503fac30142f806f9863d45710d806b777440d5d99193cb105f56955ef3a78638af63b96e4bd764aee6e9cc5b43e1169cfc6 WHIRLPOOL e3f5c1dbf036a79afdb98723b6383490234c356088c358968be80075341c44e12e4f282a9d0887674b68bbf5c42cc83e6ec0d68e9b97b626dad9ec41c59531f3
-DIST moodle-3.1.1.tgz 37479843 SHA256 7460caa0ba242de1ba3ed83bce3aebe138ecc7472d1fa96f6d28946a8e38bac1 SHA512 12c5c68691833033518f8dc9ce9053eb5a5bf88ebe7c4683c7ef611725d2763ad34f1af9e64d9696f4bb9d3a454c41f7516d040f34d7b6f88da1c140d074a552 WHIRLPOOL 871a12f9a49eacd545cbf02cacdf0700559a818ad5b8d3490782c8d84f5191772206dadadf24f2904d4a322705febf51f7dde60ff6afd3cd3b31de187bff69d4
+DIST moodle-2.7.16.tgz 35008687 SHA256 9f10cc5c5b9628c255b90fde3ef35f9944f187abdd2162dca910d33bdcdc6968 SHA512 616d622572a5fff4f6eb75b102730624ae44875f79e3adea8e6714606b9c1e5cc0a38b05e39a66fc4aa99bf2ac055e4301bf1f7741e725ceb0fa5ed7a4d93d94 WHIRLPOOL e6f9cdbf94933d55f8c83052ba9eded3ef9ff632863667396151244ea0a7a88cade3950b65be9b44491f3a7aa8d0dfa0811c402eb82ee9ad7f5a5b65b25ea66a
+DIST moodle-2.9.8.tgz 36585205 SHA256 6606ff315bab35538f1e1fbbd51b3b65b6d59043689fa74938a3cc05d5236fe9 SHA512 30a4bfce6c2a4c0c8a46db830b4a418520fc61bbb046c1203c5481d1621bb829c48a0a159284ea1435aec296cff939317dedf136fe7c5c1c42ca660dca611369 WHIRLPOOL 4e24a04d30636a7ec2e64d0306393b390ef8da9c10566aad8db80b938a993584e7d1c4895496045d37ee3689ac935a3a96ce3c6ba5cd91edd76289946a9d3226
+DIST moodle-3.0.6.tgz 38172652 SHA256 f7500e97a58942a69ee04f6f6155cbe93e1ca0631950c29d60a56babc25af7ee SHA512 2b61801e48d7db151fbfb1f017a19024f1cc24f437b63f91ef2f5a305e958e79ad5aa2d7cf5360839f8ad84e1568d8a5b3d7f7f6baf95ee0209091903e4529fa WHIRLPOOL d4965ac2526717ae5d00d380c2b42eec2f89ee1ff27b4f863d39d44e056da3c5fe6f802f5386d0e81029a84fcff457432f0ee6517b48f8f62a6b2644d519eda1
+DIST moodle-3.1.2.tgz 37508124 SHA256 a9315cd4d615af9b55541bbcaf65104c6167c7c92f5bed5c7ea29876d6534d7e SHA512 82f3448c2255d7665a2acea1baeaed9982e3a9a96842a5878ed02d92a5f92b8f00d7b43d6393018d604151f348d7fdc371b200569fd5b5ba4a83081f0604b693 WHIRLPOOL d38a865067ec91421c7d961f05140e4fec94373dcdf79b08d8aa82bbf94df6411a2eb32748e9edcd779ffdf8738a0d40b779f0784b54da4bfc7b0f045c56e279
diff --git a/www-apps/moodle/moodle-2.7.15.ebuild b/www-apps/moodle/moodle-2.7.16.ebuild
similarity index 100%
rename from www-apps/moodle/moodle-2.7.15.ebuild
rename to www-apps/moodle/moodle-2.7.16.ebuild
diff --git a/www-apps/moodle/moodle-2.9.7.ebuild b/www-apps/moodle/moodle-2.9.8.ebuild
similarity index 100%
rename from www-apps/moodle/moodle-2.9.7.ebuild
rename to www-apps/moodle/moodle-2.9.8.ebuild
diff --git a/www-apps/moodle/moodle-3.0.5.ebuild b/www-apps/moodle/moodle-3.0.6.ebuild
similarity index 100%
rename from www-apps/moodle/moodle-3.0.5.ebuild
rename to www-apps/moodle/moodle-3.0.6.ebuild
diff --git a/www-apps/moodle/moodle-3.1.1.ebuild b/www-apps/moodle/moodle-3.1.2.ebuild
similarity index 100%
rename from www-apps/moodle/moodle-3.1.1.ebuild
rename to www-apps/moodle/moodle-3.1.2.ebuild
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0a658b0319a7..455c388fbcc6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,4 +2,5 @@ DIST chromium-53.0.2785.101.tar.xz 460816384 SHA256 edc55ed74b11064251be35ee89cf
 DIST chromium-53.0.2785.89.tar.xz 460845036 SHA256 2e3c5f7b12b5b4f150b93004a718fb85778aeddc4df05bbf92b99a19a1c63dee SHA512 b1ae1021bcebafa2e9e639d1ed14112d1553bad739148e52ad8831c7ae8bc3c1933a7c06bab443b694cec1f6a50eec82148029408bc5032c7e0ebbf75b502d55 WHIRLPOOL 1dadb6d32ad5d2e7a0caac4cc4ba3146c33bc375655cecda11580acc6e12617279bcf7eaf6fc481f0b8993cbced422b9596ecad1280478e4a310ca762fd1b622
 DIST chromium-53.0.2785.92.tar.xz 460758172 SHA256 6130483e86c0b22c02c75ec453cf0d54f1079abe2c5c151379fb2eba2411f0f0 SHA512 134413c3d2a21efcf6f241d5343f5c9a4ff315aa425f53c7d68d54ed4baf52dc9d669269910c955fb9a8fd32cb9720b9318f735a5800a1a839beb733f0521124 WHIRLPOOL 53170d162304872d14533409cb794b51f453145d24193213ab967115cd40fa0e32e2ad146d69a938a7a91201d569dec56b120a16c3da15011c550d60978f9ae4
 DIST chromium-54.0.2840.14.tar.xz 479445432 SHA256 b606d9ce2f94b4e30dbbb1a3eb21b32a438681ff68d57c7a540fb6384f3624d0 SHA512 b41dcf934e2240c2cd948120017293a86857d9a698259b7bad022c21e7f06998717eb95ffb9495dc854d40bd7935b88ce7e5720f27c60fdab4b57e9e838c5b3f WHIRLPOOL 6377a19aff47ed841de3071f8bc3a1a80a8aa1f336576b058ce6afa78500112aecea34adb9ceb3fd31c68d111dc1b89e1665a4c2b6daf5b399be3065802a249e
-DIST chromium-54.0.2840.8.tar.xz 479432364 SHA256 1c62b5246bb7d4a0ec30b3266d8b378d5840765451a0de31a12c45ab5cc2ccd8 SHA512 f90b47e4ae337d3765607129f9176752fd3ccf0648c51385e1298f4373a516d9c37af79c91fd9969bfe605bcf6c055a4b121e6bc814aed187e6efcc19edb45cf WHIRLPOOL 4b28f6b741a0cf51c4550c68d57657e5978ba71d4ed0757be62878ad580161a7dda9849c917050b8db796af90e7918f750bfdc6ef53d3d79217aeee535ce7a81
+DIST chromium-54.0.2840.16.tar.xz 479459252 SHA256 ba869ffc64ccd4cc16d844e76da71ae62f1c3fb32f55cd1d153ee386b59940af SHA512 b11e10b409d48d0e7edf6ddefc080c6776feb0cd238afe08fad8b06dcbc87c88ae5fcb369760fdcf35805060a42dfd13eaabec5c5f3b6ec95df51da34913a391 WHIRLPOOL 88a27dc0545fa14ac88f8d157c0cc3ec6739d348df6055435d369706fa2d62c60dd34941c49c6489ce279298501757f9a3a9981f92740cd6c58b938f58291438
+DIST chromium-55.0.2853.0.tar.xz 501960780 SHA256 f6cff02888c5a781f29ece91df38c874a2245f3e12495cbdb49c141db211835a SHA512 4963f9aa3b965845c518b6565f8b1494ef59ec090c3d9b559cb01ddbb883dbc421d72dac6f6a652fea484821096a0ce2ccc4370818a74803d29aebdfbf956efd WHIRLPOOL 0b8469540a0a952483629ee87f90368d4597fbb82ba532edc1b6d7f5670e3155bb822b5f30a1764d9c547ac71260ee0cb44328c9d6320b2ab331f1661dd948c6
diff --git a/www-client/chromium/chromium-54.0.2840.8.ebuild b/www-client/chromium/chromium-54.0.2840.16.ebuild
similarity index 99%
rename from www-client/chromium/chromium-54.0.2840.8.ebuild
rename to www-client/chromium/chromium-54.0.2840.16.ebuild
index fc7f8e0a5592..b45ea2169cee 100644
--- a/www-client/chromium/chromium-54.0.2840.8.ebuild
+++ b/www-client/chromium/chromium-54.0.2840.16.ebuild
@@ -21,8 +21,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
-REQUIRED_USE="gn? ( gnome gnome-keyring )"
-
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
 
@@ -98,6 +96,7 @@ RDEPEND="${COMMON_DEPEND}
 	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 "
+# dev-vcs/git - https://bugs.gentoo.org/593476
 DEPEND="${COMMON_DEPEND}
 	>=app-arch/gzip-1.7
 	!arm? (
@@ -111,6 +110,7 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	virtual/pkgconfig
+	dev-vcs/git
 	$(python_gen_any_dep '
 		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
 		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
@@ -412,6 +412,7 @@ src_configure() {
 	myconf_gn+=" enable_widevine=$(usex widevine true false)"
 	myconf_gn+=" use_cups=$(usex cups true false)"
 	myconf_gn+=" use_gconf=$(usex gnome true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
 	myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
 	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
 	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
diff --git a/www-client/chromium/chromium-55.0.2853.0.ebuild b/www-client/chromium/chromium-55.0.2853.0.ebuild
new file mode 100644
index 000000000000..e025a39b3e36
--- /dev/null
+++ b/www-client/chromium/chromium-55.0.2853.0.ebuild
@@ -0,0 +1,727 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/libexif:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libvpx:=[svc]
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	gtk3? ( x11-libs/gtk+:3= )
+	!gtk3? ( x11-libs/gtk+:2= )
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	media-libs/flac:=
+	>=media-libs/harfbuzz-0.9.41:=[icu(+)]
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!gn? (
+		>=app-accessibility/speech-dispatcher-0.8:=
+	)
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/ply[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
+	"${FILESDIR}/${PN}-system-jinja-r14.patch"
+	"${FILESDIR}/${PN}-widevine-r1.patch"
+	"${FILESDIR}/chromium-54-ffmpeg2compat.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if tc-is-gcc && ! version_is_at_least 4.8 "$(gcc-version)"; then
+			die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		breakpad/src/third_party/curl
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/numerics
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/murmurhash
+		third_party/angle/src/third_party/trace_event
+		third_party/boringssl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/py_vulcanize
+		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
+		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/ced
+		third_party/cld_2
+		third_party/cld_3
+		third_party/cros_system_api
+		third_party/cython/python_flags.py
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/icu
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libusb
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mesa
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/openh264
+		third_party/openmax_dl
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms2-2.6
+		third_party/pdfium/third_party/libjpeg
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/zlib_v128
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/smhasher
+		third_party/sqlite
+		third_party/tcmalloc
+		third_party/usrsctp
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/x86inc
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg )
+	fi
+	if use gn; then
+		keeplibs+=(
+			base/third_party/libevent
+			third_party/adobe
+			third_party/speech-dispatcher
+			third_party/usb_ids
+			third_party/xdg-utils
+			third_party/yasm/run_yasm.py
+		)
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	local myconf_gyp=""
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf_gyp+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gyp+=" -Ddisable_nacl=1"
+	myconf_gn+=" enable_nacl=false"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_icu (bug #576370).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf_gyp+="
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libpng=1
+		-Duse_system_libvpx=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	local gn_system_libraries="
+		flac
+		harfbuzz-ng
+		libevent
+		libjpeg
+		libpng
+		libvpx
+		libwebp
+		libxml
+		libxslt
+		re2
+		snappy
+		yasm
+		zlib"
+	if use system-ffmpeg; then
+		gn_system_libraries+=" ffmpeg"
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
+
+	# Needed for system icu - we don't need additional data files.
+	# myconf_gyp+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf_gyp+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf_gyp+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use hangouts enable_hangout_services_extension)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=$(usex gnome true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf_gyp+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf_gyp+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	myconf_gyp+=" -Dfieldtrial_testing_like_official_build=1"
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gyp+=" -Dclang=1"
+		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
+	else
+		myconf_gyp+=" -Dclang=0"
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0
+		-Dsysroot="
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+	myconf_gn+=" proprietary_codecs=true ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gyp+=" -Dgoogle_api_key=${google_api_key}
+		-Dgoogle_default_client_id=${google_default_client_id}
+		-Dgoogle_default_client_secret=${google_default_client_secret}"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		target_arch=arm64
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf_gyp+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf_gyp+=" -Darmv7=1"
+		else
+			myconf_gyp+=" -Darmv7=0"
+		fi
+		myconf_gyp+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gyp+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gyp+=" -Dwerror="
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	if use gn; then
+		# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
+		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die
+		myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+		out/Release/gn gen --args="${myconf_gn}" out/Release || die
+	else
+		build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
+		egyp_chromium ${myconf_gyp} || die
+	fi
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chromedriver"
+	if use suid; then
+		ninja_targets+=" chrome_sandbox"
+	fi
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox || die
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins out/Release/icudtl.dat || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r4.patch b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
new file mode 100644
index 000000000000..3abfc163e8a2
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
@@ -0,0 +1,48 @@
+--- a/media/ffmpeg/ffmpeg_common.h.orig	2016-09-09 13:16:07.757294768 +0000
++++ b/media/ffmpeg/ffmpeg_common.h	2016-09-09 13:16:41.705989273 +0000
+@@ -22,10 +22,6 @@
+ 
+ // Include FFmpeg header files.
+ extern "C" {
+-// Disable deprecated features which result in spammy compile warnings.  This
+-// list of defines must mirror those in the 'defines' section of FFmpeg's
+-// BUILD.gn file or the headers below will generate different structures!
+-#define FF_API_CONVERGENCE_DURATION 0
+ // Upstream libavcodec/utils.c still uses the deprecated
+ // av_dup_packet(), causing deprecation warnings.
+ // The normal fix for such things is to disable the feature as below,
+@@ -35,7 +35,6 @@
+ MSVC_PUSH_DISABLE_WARNING(4244);
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+-#include <libavformat/internal.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
+ #include <libavutil/imgutils.h>
+--- a/media/filters/ffmpeg_demuxer.cc.orig	2016-09-09 14:21:40.185828912 +0000
++++ b/media/filters/ffmpeg_demuxer.cc	2016-09-09 14:21:52.894089352 +0000
+@@ -1185,24 +1185,6 @@
+   // If no estimate is found, the stream entry will be kInfiniteDuration.
+   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
+                                                     kInfiniteDuration);
+-  const AVFormatInternal* internal = format_context->internal;
+-  if (internal && internal->packet_buffer &&
+-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-    struct AVPacketList* packet_buffer = internal->packet_buffer;
+-    while (packet_buffer != internal->packet_buffer_end) {
+-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
+-                start_time_estimates.size());
+-      const AVStream* stream =
+-          format_context->streams[packet_buffer->pkt.stream_index];
+-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-        const base::TimeDelta packet_pts =
+-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
+-        if (packet_pts < start_time_estimates[stream->index])
+-          start_time_estimates[stream->index] = packet_pts;
+-      }
+-      packet_buffer = packet_buffer->next;
+-    }
+-  }
+ 
+   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
+ 
diff --git a/www-client/chromium/files/chromium-system-jinja-r14.patch b/www-client/chromium/files/chromium-system-jinja-r14.patch
new file mode 100644
index 000000000000..4dba04433ebb
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r14.patch
@@ -0,0 +1,31 @@
+--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig	2016-06-02 09:54:28.510152077 +0000
++++ b/third_party/WebKit/Source/build/scripts/scripts.gni	2016-06-02 09:54:50.966612510 +0000
+@@ -9,10 +9,6 @@
+ _scripts_dir = "//third_party/WebKit/Source/build/scripts"
+ 
+ scripts_for_in_files = [
+-  # jinja2/__init__.py contains version string, so sufficient as
+-  # dependency for whole jinja2 package
+-  "//third_party/jinja2/__init__.py",
+-  "//third_party/markupsafe/__init__.py",  # jinja2 dep
+   "$_scripts_dir/hasher.py",
+   "$_scripts_dir/in_file.py",
+   "$_scripts_dir/in_generator.py",
+--- a/third_party/WebKit/Source/bindings/scripts/scripts.gni.orig	2016-09-09 13:40:51.971660406 +0000
++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gni	2016-09-09 13:41:15.472141236 +0000
+@@ -9,15 +9,9 @@
+ bindings_scripts_output_dir = "$root_gen_dir/blink/bindings/scripts"
+ 
+ jinja_module_files = [
+-  "//third_party/jinja2/__init__.py",
+-  "//third_party/markupsafe/__init__.py",  # jinja2 dep
+ ]
+ 
+ idl_lexer_parser_files = get_path_info([
+-                                         # PLY (Python Lex-Yacc)
+-                                         "//third_party/ply/lex.py",
+-                                         "//third_party/ply/yacc.py",
+-
+                                          # Web IDL lexer/parser (base parser)
+                                          "//tools/idl_parser/idl_lexer.py",
+                                          "//tools/idl_parser/idl_node.py",
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 7ff6164c7fa4..049434d2b6cb 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,4 @@
-DIST opera-beta_40.0.2308.15_amd64.deb 48257698 SHA256 85bca35d641ce9c431b36fb5c9d3e75e1aa4c3264fb6ea3ca9e6ac9612feaa0d SHA512 5a113e0348e3371bb9502a8c738e9d8ae84b8d4d889a233561bd1f3f22e0170b3c3c579656f5f48103333a6450f71020b134828fdd2657c1980743ceb9955837 WHIRLPOOL 60bc4bbca6bcb1c20f1095ccf3ef8ac3bf653817a9b0ca87f42690cb7a3e0acb91fd91008be9bdbced3e33a87236347c92e53edc13b49783e2c9bb89c24f1237
-DIST opera-beta_40.0.2308.15_i386.deb 49314244 SHA256 e7f5180b19a05ef6ea3714bbf53bad1e353edf97b8715f78e933feac3e95bad8 SHA512 f4cf28113ff841fdc444888e21deca822bf17f8d9cfc68c76e157ae680476115e179a40aa85c1e2c4625586003b641d027bdfc3fcc49239ee84ba4bdc1567808 WHIRLPOOL bd27829ed51b57bbc6b8e5186faf6728bda071706218055934649fdfbbc4d1a2f77dac9824c592cbbc0cd0cc9a9033915eac50a17df42fa5eded8465f339d4fe
 DIST opera-beta_40.0.2308.26_amd64.deb 47713082 SHA256 29c193fc0cd4fb0c551ca327f94bd953944ace5557c4c34afe991ad66c2b949f SHA512 490dc52b04e6395351736a2ba4145711adff368f65bbc699475d8f448d008af5e4f6e7ca89a291e57dcaaae7e0af9a037341eb738f1297c99f0ebc6af1f666a4 WHIRLPOOL 325ead4bc5fed501a4c07c4400e9821924510bbfdfcac572fafad2d167fdbddb1d85be0ffcb13e7f0f23045652e1d6eb105ad5e80dc1524efe4fe5bb62c2698b
 DIST opera-beta_40.0.2308.26_i386.deb 49171780 SHA256 0a55dd2347045958afb276764ea6bcef1aead3cfba4a68b762468f01f9e60d42 SHA512 cf943e2a3a5c3b3fc90be2ace9b741be6c4e943560a262d95b21bd7687dafff34fa3c52813074c80e573c505315da95ddb285f0a051fd84c44b4bb2236dbb179 WHIRLPOOL 7960ac8276ebe3592a749a65f7614522382ed1df6aafc48dcb1a324965f0d35239577d94ebde81e6bb9251747268c3bdf3762d949f0de5810febf496a1701d4f
+DIST opera-beta_40.0.2308.44_amd64.deb 47607458 SHA256 9b54d6c88c186e1f0cd07e2322380feac3e3cead0132a6b454a86744f2db39ea SHA512 a880ba6575076cf0379ab43d01140ca7c988c60f1efa3529d921d0d9308e2c7404e6f761a689408855bedddbbc24372f6d17d73d5f2eb7e14c648cc165ebd7a9 WHIRLPOOL c839361d257486ac6069d0a09e48011d67bc98d1ead05023289c38f6561655dd3905a0843f20be549dd92ef57948a94dfcedfcc2b1d1331831a60a821ed99f9e
+DIST opera-beta_40.0.2308.44_i386.deb 49285342 SHA256 e233110cfea638235d7d90ff94ee3d5c1a757b4969d575fb92c44abaa516ceb7 SHA512 d7d43235f2231cc3e31e72bb172adef8e3c1242492ef16f563231409a3158e6710cfa04c25c39bf649afa0ad05687b8fec60facb114ad393397365decde12b5b WHIRLPOOL 9e164b2ab14ea4c12dd92946eb93abe5277193892ff30ef57fdf8a44db14c1b84653b646d389331205b4e1beacaf29f3c8df2262a4c2f3895561c4dac1c24f72
diff --git a/www-client/opera-beta/opera-beta-40.0.2308.15.ebuild b/www-client/opera-beta/opera-beta-40.0.2308.44.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-40.0.2308.15.ebuild
rename to www-client/opera-beta/opera-beta-40.0.2308.44.ebuild
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 1b320de3d0ac..4c52a42589fe 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -18,7 +18,7 @@ DIST NVIDIA-FreeBSD-x86-367.18.tar.gz 66752524 SHA256 48f91a7f0ccc252f3812eba00f
 DIST NVIDIA-FreeBSD-x86-367.27.tar.gz 62605521 SHA256 906038b40f46b2a5c8915b57aaeb0432eb4e60f6d156845e6e2afd49ec9d78b8 SHA512 166bd578b5536772e81f05f411e1bbdd2d9cd81f7210e96a388eff758bd1bb714fbf5dc2f3e4204e08e7555558e74901d6ad96607ee9c7b32ca4fe0b0cf373b5 WHIRLPOOL a31e9fe0e5817f1232a2dba8719110e9404f9b2feee4e0d6fe49ec50b63fd24852863670f0c36de357c9ed357738c30d1951e8fb1e6f40b5b2f8a1e2c7a8dc84
 DIST NVIDIA-FreeBSD-x86-367.35.tar.gz 62636433 SHA256 2edf78801213dea72ddd6c40acd860893623224166ad522fd47e202443cb6d50 SHA512 7b056814be81532dcf63bae13a55a3f190325c207e6e675151b01f655c861ec85804792a43b8c82a3e733394c92b336411ec4e2e70d308c70036f6625d55eb78 WHIRLPOOL a7768389f1e69b7a373e7e2a4cbcddb2f451a8b44346987ee898093c4c87c57a69744c1f7538fd41d1f81b44e02e505107f73c7584c07bce4104dc09349ece4c
 DIST NVIDIA-FreeBSD-x86-367.44.tar.gz 62815733 SHA256 687a178cc0e63f79f38f6e71da904363579b833ab3dadac424bcb2264889d4ec SHA512 2dccfe2b1b86d972b3a8961d8eb114911784cd7fab6d8cfe667a0e2853234fe3e4b2661bd5d0064677155f9631315d1000f23c11feea035292c55dbe73f4baaa WHIRLPOOL 4b243c3c053a11d723fd4fce927e15b36524cf6c4795763a5c728de8952c80e01a72f7e023456637917253dd1298bf6a732cd76da3f0648c26d48088d937fb27
-DIST NVIDIA-FreeBSD-x86-370.23.tar.gz 58560696 SHA256 d70aa4a7334e0592f359d089eb073b7731901c947dd7bc5b1346ee775330f05f SHA512 a5b208053d76b044687431d8e72bb75b7f7ccf1c041da82d910ca3fc9038c707b1bf0f8fd3f57d191c42d8caaaec46a3df5fc628f00b12f63ebfefc6042efcb6 WHIRLPOOL 33f589b8d57108e3202f22844bf7c12c6c38e631097ef4a8f81c7acc2284d983cb49d49ea81c362e642392967eea4155e986e3fe7357fa6b8c84677db25ef531
+DIST NVIDIA-FreeBSD-x86-370.28.tar.gz 58718517 SHA256 52193b15b4ca822b029f860eed4d00270c925f5d24f7bb511a5b7bbea696d58c SHA512 83ffb19069cc240f8836d808a5eb02c142e7ad923fc2e3049a3b316acc12df070d42dfdc5a8a8e1411ccc9fba0bfa4ed84f457435e985434cd86ae966a63a3f4 WHIRLPOOL b1bec4d5e34ea39c3b1b44adcf85b7392cef39517979d32bc800e48a79a57cfb5f1ca5ff82bc302aa67ed12094782e09ab146f021a9c04e18430034a5ab341a9
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.131.tar.gz 35812363 SHA256 e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a SHA512 0df69d11c79cfd66f40f5adf091f9c3ad494b89fbe9200a1a01fef8cb2d2591ffdeb703d82a263e050384d39ef81af3a717ac24716f96b1fd8386d1758bcf45b WHIRLPOOL a7e01ac4646d52229efb1d22df9b4db98bfd6bc30c79fc4c65273001b1cd09c4db823a0141a060f8c53926ae23a33fe66e27aec805879228d64bf3f45aa66bcd
 DIST NVIDIA-FreeBSD-x86_64-340.93.tar.gz 60215584 SHA256 07208f6a832c2da8748b1c4f8b5ce42a7b617f2ee1ac59155fecaff952c30988 SHA512 c480df2f36c3d6eba53af9c3070e1561ae7c56cd5d31fb531dcb6897ca02d0d205c0ce99597304ea36b7b75b173e31a9a4c07ddd143ad13884aff0a7c3479bce WHIRLPOOL c1b28898ffe733961bdb622e8b430715c74871cfaab0348a9e5990df5a92676e8fb8c199ea1f1a06fa6c6ded65877b987b802a7a9ea0b7023cbaa62fb52eda01
@@ -39,11 +39,11 @@ DIST NVIDIA-FreeBSD-x86_64-367.18.tar.gz 63499863 SHA256 be862c654e290b32d78275d
 DIST NVIDIA-FreeBSD-x86_64-367.27.tar.gz 59357230 SHA256 dea9bf156229b9353e033fa3cf02685c14e539d959d7c2759f233ad1f707f2d2 SHA512 3eb129723317d277c0788b966709369c382035e287e4e14000fae09b98bc12359e5218205a86abcb08894978343f3185986d643df3ceeb81b35ba475bb16b99f WHIRLPOOL a33ae3d01d953b090e169e651ff9cc478d91ea21753cbd4c806dc08898edbd078d191d91ae1f7d46dea8ba931bc63f722bb88e728e31cf98a7681c1d806bd1a5
 DIST NVIDIA-FreeBSD-x86_64-367.35.tar.gz 59393955 SHA256 b33057ce23ce1ae44ddd246a7d2d9e2b0aa2ed5a289d8a83e849249de81a1035 SHA512 724735dbe9a79edd50405b8ccd76bfca35d706b61f489fb57c6b7b71d070148ea97603abb96deab68df1c56e2a48e301eee75fc0de99b15b56d112660ef3bf14 WHIRLPOOL 690220131b40c8e84184c8fc0a5c4f511b44c84863f73b7610451ad9dbc6f563ce8b3b86b38b0f5b2311a2721288d788044c3477a4d76563effad1ed706cfa06
 DIST NVIDIA-FreeBSD-x86_64-367.44.tar.gz 59577943 SHA256 e07d21b0ad39a0a24cdc4840094fb2f2de2f52b704538f7ac60c019465de7137 SHA512 98433879d9093f67a1b794e4c171479871cd489d5577a58084c3165c26d9f733117cf9043d33f5674f51d81dc509ab545b65d538a261f9dd6db4fcf2855f3655 WHIRLPOOL 0320b14e56f800b6fae313b61665fb2390e8f2ed1df63126fb12fdc08dae67ad4e4e9fb9a58950ad26c8e62ad4ee0b3ab96aafcf53a525687e240a77b58c5291
-DIST NVIDIA-FreeBSD-x86_64-370.23.tar.gz 57734638 SHA256 e661ca8442580cef98520d8247b5b74e6ecf5de34e8b903258b078ae401049c0 SHA512 ebcf65a03e31b573f29cd4697683d8cbfaacdada8e56058e9bf26be00e8476af48fb8b2a395b735294ca7b041100524a2f22c07ec6d1aefee75f0298dbbc8e11 WHIRLPOOL 6d4df4c4295daada5e8f9459cc81826c28a087190db7cb189a8d694cbc956fd020a0013166897d220265afcd6d47dd7bd00732596f722d862429a107afd6825c
+DIST NVIDIA-FreeBSD-x86_64-370.28.tar.gz 57905860 SHA256 5087a93af8aaab6cff35ba60c9d67b4249827f6b7681abaaa571a20784a54552 SHA512 40637d64a0ee5029bb1c5ad7a590c5be61253ef6283c4217666768ad8601d7f51ef0d8705c8711f65c3d0a5a5721490813220c5f9186c6d2d12baf5d9c11122e WHIRLPOOL 361648788b7efb9e550b3e67d2e6022e31dab29f5660c42a1b6c961fe4638216fb8785814ee9fa1636fc39c39afce7caffbdc24fcf8bbd14e4eec5b5eeaeb1eb
 DIST NVIDIA-Linux-armv7l-gnueabihf-367.27.run 25585174 SHA256 ae0855b247d5a5474561c76a79536fe82c44bd10e6154792978c5572d11c47f9 SHA512 dd60292f262e1d7d6cca09a35c3f8b65820d216d46f2b94feb208554496b30a983a73ffb8b2a1473cef0b7e08a3cda901eeca855e1db77f4f6dd23779772580b WHIRLPOOL c55d4102a6717f81d8bde7e66d1772c7b1f370d4d610ef61561c94f5ea6cc4797b5f15b9cbc31216b2ef9ef9132a66682b280d9ef5b74c4a57ee2ee8da6c1122
 DIST NVIDIA-Linux-armv7l-gnueabihf-367.35.run 25628654 SHA256 6087bd2cc594f860d27d26e30acd3593310ce00938c10e5729175f037efa222e SHA512 3157c3dc9d07dd0eb8aaa0bf21edf62aa1338f10c1431981494d2a7b1f0be8a1eee8b5bc41914cfca9b4c76773b0056e7ad5c80a4c7acadfadb52a7647baabbe WHIRLPOOL 49c8896d1a40e1f634224227100b303c3d2ebc66ee93f31aa18bc39c898585eba49400d148f47476e4253d35d7379047dbcf7f43cf027df0b16179bfc8912db0
 DIST NVIDIA-Linux-armv7l-gnueabihf-367.44.run 25674978 SHA256 b42af2009460614c6d4b6585535dc2f0c1e98244f00bf75ece37dc31d2cc45c3 SHA512 0fd72fe7afa1415eb961a5308c142316cb5311195486b331c406f4cbcc7d30dd5f0e85e5b179ffb8f38ce5ee1b5abac671d89f62b7dc7e1b1d738212af6acd91 WHIRLPOOL ce2b0fa6b8c545af63292da214cfeb564f765179f531907ac7750c7a9d890816ce869dd7e6898ea0a0a6f446d20868d55c235a5ee2e88105731e8812b5f67c79
-DIST NVIDIA-Linux-armv7l-gnueabihf-370.23.run 26484565 SHA256 9fc44fc0a109606349a88b6f312adf92767c0ea8f6e83f9cfa49ccbb0068edae SHA512 12f0d46a6eb52755b05cef06f71d557ef40e9b9df3765faef09116f6161cf52a3c5cd82f72009761fdf7f9a3b03c4bec93e8f5bb003783cb427901e39dd61bff WHIRLPOOL b10b932bfc955d418bdc39cba36dc68a177f9899cc4562942808b48482240d5fb00ce10e755f4436ff9981e92fedf9c80300cb95c9571265e84fedff79d6ab3d
+DIST NVIDIA-Linux-armv7l-gnueabihf-370.28.run 26117701 SHA256 efb60a23aa22b46e94e91d5f5a5fc0c17b47bcf50471e4371653ced5a5350dce SHA512 04699849441bccfb9214fda4c7ff8ecefa11249d1fbfe470e37fefdd132becc225a1bcc16bc976c3fb145a427961f5402c95ecc84b613adb71caef9c96fe7d90 WHIRLPOOL 675a495594c46666ec11c83a76cdc8821e9b57079ee53cd7adcf00e783d121e163b7c5b10598aa55a1fee72eee47defc514fba986685af41c90ab2c5d890abbd
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.131.run 40893199 SHA256 d2554bb6f7867e7762d0ecedcac5bde7de0634e43b952bf466323ea8b4032da8 SHA512 3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e WHIRLPOOL 88e9cc0270a4fc64ed8475a217c7c8c50e6ea21fe14b5b5beb16f494bd62bf5ada2f47e26e5380dd3d0bc678091e29f0e26937eef1ee3c7bdc5805153201bae3
 DIST NVIDIA-Linux-x86-340.93.run 38703394 SHA256 4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612 SHA512 7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5 WHIRLPOOL 242190999da74f2fe4bfe4b223f43dec6ec73d97afd1e84e2c78c5fd5616d9814b647067ddf3f591ea8064d29234491de1c6f87b442e240d2aac4a1e598aefad
@@ -65,7 +65,7 @@ DIST NVIDIA-Linux-x86-367.18.run 50290002 SHA256 9a5184308a981b1b36dde4466006b7b
 DIST NVIDIA-Linux-x86-367.27.run 44740794 SHA256 faa7c0f73c04a6d343a3952d264ec56fdf816cc6bf2a1c1bb95726401e99654b SHA512 54302f0de936a859561b756989ff84f73afe41dfb89ed680ee3df3c46b0de9d57eaf2d07876dea0eb1154fbc1a716d4d3e693cb7eaa7ab325b4bbee569ddb709 WHIRLPOOL b46005fa221f0e9b466168530ff08271c63d72a29ef1dea2831215aebd7b4f8dc2947d1f56f1fe490e4d809ed337f7f9116f0263f187dbb7f3d347378367a552
 DIST NVIDIA-Linux-x86-367.35.run 44717708 SHA256 38cb22fa85ef74ea960d3e5d644838cd961984ffc32bb0d052414cc7fa32e315 SHA512 3151995153a3c3857e291df933dbaeaad779544a39a9482980ccb89531ca924d71e6bf0e44767755c484c4b693cfaf01f55e61e3d82cef79f73c0b1964411f39 WHIRLPOOL ff85a42f339c59ceeaef0dc2c6ebc2a52c516fb09f05d16ad91e7c6f7d3368b8af717a2a716a1d606927a2bba689d755ce64b0d1e256ab809040c662cbb2f1da
 DIST NVIDIA-Linux-x86-367.44.run 44079774 SHA256 b2ad4d0d4a2e98528e877ae0d98c38039c2400b09cfb5928cd21899f3a991291 SHA512 5dbeda283b277697eb161b01a6d361a68fcc5e982fcbb9f6c9d08705c9af8b0bf3d78cf68feddce9d72407eea3ccabf955d404975fce5e56d1690bc5008577da WHIRLPOOL ea5f4f9c43cfb6db33906e715fa6b4d5a298e4bbf76959c18589753bcce5b2faa91c38e0aad10e3bcd89b28ee2ee8b73da3deee6c048bebc08fe93e32e214b7e
-DIST NVIDIA-Linux-x86-370.23.run 42185790 SHA256 7a275413a3709ef11649ed65d07bae92368c0a1b754fec5c9f9769e516a19263 SHA512 af944f570736e5c7445b9e4dbdff9cd0566054fdb16140010a986bfe2c30374c26c1487deeb931a78c21de9fd0622627f2f98ceee46d3767432b967bd46542d0 WHIRLPOOL fc77357b6e5d38162138de1d089a64588801c02b1794a923a5bc9001464028a5998054c6f3beef2c36188eb1f4467822b0e9d37e9f813210790a049403ccf2ee
+DIST NVIDIA-Linux-x86-370.28.run 44189522 SHA256 6323254ccf2a75d7ced1374a76ca56778689d0d8a9819e4ee5378ea3347b9835 SHA512 2df8b3d1064073c8b793287994fe0648625d095f3434b7b67531e19632cbad318994df90b55de18aa457d55a1374b35d64a646564259995d3f2197c48737921c WHIRLPOOL 85a089c833311abdc06bbc1fc68cd5ff8ed43dd5e5887d340dc854f905ae741de0ae4343d024259f493dd668075096c460bc1f93c1795d2befb81dd3c4a4983a
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.131.run 69415084 SHA256 74b7ec1c31dac03ee7c3e04612cadb9cbaa01ef4c796c27a0a649f7d32dccd0b SHA512 ddfa1f23600821dcae17ddb735b615d67504c4e276d9b41813e0f8d7690fbdf48f79644ee4c9e5449ce22a31460734cf325fc83975e0b48a0379a85cd4ef747d WHIRLPOOL fc08c2337a1b80b0444dbc914f7d17441995e4965c435028194050df9f5ec1606cdfb5bf11e56f79a736e04cf0755b296017fe79629c5ded18a72093b8689bce
@@ -88,7 +88,7 @@ DIST NVIDIA-Linux-x86_64-367.18.run 88160263 SHA256 20d0e682ac2be862e574d3de5b39
 DIST NVIDIA-Linux-x86_64-367.27.run 76945324 SHA256 7b84583f8ed90b2b97ed4f9bbafac2b054da285fb94b37cfaadc5741cb442571 SHA512 d1aac4eb2e805054463cb974e4a4acf96a0404bf75de37188ccd0bd5a88916d003941b70f695216dee543b12779a38787c9675bbe03803ae15d6a48d1013ee28 WHIRLPOOL 8b71552e91eb37f1a3f6c0a11987471ef366fa97b4c580535ed35c8b650d3cb58ada09c5d1b4cdf803c5bdc3720df2f69c9e44153088861f2c78b55836559b7d
 DIST NVIDIA-Linux-x86_64-367.35.run 75600336 SHA256 d2df3fcb1a145984b9de4f2f38a90e353469e9d12279cf5e2c67c553b112d075 SHA512 18e2b1f342d1fc73c68f3c3ce526ab744fd7dd664cfd857849d497baf94eb057482d88444a792b64d3cd71ac624b9cbaae39b7f1884ca0370521cac0e5650d1b WHIRLPOOL 93612de22e0298383dfb16bf0f8893b55359a634c331b981fafebb1cd1a1dcfa602e1b35d2ff4a128b60753146bc494852410352be9309e531c78f62f708d8c3
 DIST NVIDIA-Linux-x86_64-367.44.run 75032664 SHA256 09a4e67afa79c159f96071215bac3e027b553117b91ee35a4ff134a98d8fe7cc SHA512 efb97ee084f68a0d4ad658f8700fec14a3b3f5ec585a14efa88be791f951445d8b6b944103bfb95408aeb43618f1a1f6fda5ab4ad7f7d2de82f1a7e92f354fa1 WHIRLPOOL 54c642a3c6b9065980569fb45cd358296205c6aa483cb1c402bc75a26f00c95783786b7f0414b11a19f0c7233c77f802c0d40494d5c859ae5c4c8da5f4eeaf33
-DIST NVIDIA-Linux-x86_64-370.23.run 74533367 SHA256 b5b3c4016a0ee595965066db293c6c9d30e6d64b9f54dd7cd2c9d9eeaf6df581 SHA512 6792281fd8c74dca00cd340f28e052ff164a0137ea78101a574082fc407a425cdfc532d14f823b27506fd1da28af78a9ce83602ac57a3df0d3056875749d029d WHIRLPOOL 7c22044a6c5228d12797c498690b648e788e1975afa83a99ed1dccd150c67a6af4fb7e2a048031e345c4e188d5dabba528aeaa547291581c86a09d0737b08ae7
+DIST NVIDIA-Linux-x86_64-370.28.run 76690360 SHA256 90aa3c186e45b39e6fc0064ab8dbda8bcc897cb61d2e7b7cb30b4ec9a4b39239 SHA512 931476f92a63d142478b2d6b3da4031769fd3b93aee2387800a78b1354b59a5fb5e4e293436b6b4c246627d51c0f55d140ab230de385cb1567bc8b25518eb741 WHIRLPOOL ce866c38291d2ab4aeeff05654a0e61196129f77baea5af93ddbc22fab9574ba39cc05d58020ea2407cc7342f0bcf5c2702d42290f4cc3b53c9e04fb7c617413
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 DIST nvidia-settings-304.131.tar.bz2 1480447 SHA256 d36d2d1ae7c1bb72cd18e713470546d2aa7057624b1f61319daf559a94054d29 SHA512 9269f54f87581e29e6d7cabeaf989c70cb27aa55f6b8f5f1c71b8a14401326d06ea194710722b41283cca56f5808b90a9b1fb12158d48c6332cce15a701c5796 WHIRLPOOL be8e38a09a0bfa40267b9cdae2800a9ef00a89e28e618b743b7acb0cd9ece4b242b74ced32018d735989592300b49b2ee683caa11a1e161bcecf070a58952dfd
 DIST nvidia-settings-340.96.tar.bz2 1551011 SHA256 af7303b070a4b41e388a7be6dfae17f020a5cc197170d4815b9a291a3a98aaff SHA512 fc6096338e48c347e4e854d06e8f63d8edb6527953996e63f3f70619be59d0436176547b5197ef30d18a82cf5b58dd775dcca4a2624107b63cce1ae589f2b154 WHIRLPOOL e7266ca0395aa1a5666a43bf6e54e258706d4e76bfd15079485e2379b332d2d6ba0c97b32e49f5b041340bb2d3c0e11dace702754ffc952c149557e0ab9d820a
@@ -106,4 +106,4 @@ DIST nvidia-settings-367.18.tar.bz2 1572077 SHA256 035a45b3deca126596c1ac6088e13
 DIST nvidia-settings-367.27.tar.bz2 1572210 SHA256 d141d56a2e9b88686a391f97636df4834b5dda132726edf69f329bcfd9db5a4d SHA512 94a29cfff1b56b282be6802deb9d6b1b81a41f254464bf0ece567e6d7d708574ca111df32d82e4af68ac2b6bdfda387bb6113c60834fb084bf15582bff6a2273 WHIRLPOOL 4bd192d2cc316f1bae3af40ec8ae03c679aa128f0d3aaedb4a3dd1240503e6ea56d20248b7f6ec7d82e1ec972719cb9983cbc1af60263159ae9d42ed7b3f971f
 DIST nvidia-settings-367.35.tar.bz2 1572606 SHA256 6b0cf0b63bbf8c3d29538587bad8b639b42f8c9bac754bf5ca629df2054a0239 SHA512 9acba704118a8523ec92d26eb998a33755d334a8c5bbd72954ce9b9afbe2cfa63a5b572199e507bf8142dcda8f02a85517115bf07386e15fafe1915ace736770 WHIRLPOOL 644e950c22f686c00e59acc499f3c7af1578cdd45ddc8e4fe53b64abb8c703062e6f2a2548cf636359d52b294ef7e31589f06b7d3e71043d10554f4226169e17
 DIST nvidia-settings-367.44.tar.bz2 1571750 SHA256 74ca3c7ac3e75c13b6aaef92739e2bdb6c9c83e4d860cbe0f1474746c6123fc4 SHA512 d021b162f1cb027da4c4f87e68608fb2efa01f82e2fb739c76b7acd2a2468aca17e9b0b56a61e2a5e2b9f34e3232f373a268eabbfa6ee49f9e9548d53affde0c WHIRLPOOL 36f8d2ab83ca12f02adab1ccd9d62cf763de916c0cf1cc5f18a14bc8428df2ee91fd270d481d225766919fc2b14361da33c5baaf83fc14e82bdc624c88a7ea3f
-DIST nvidia-settings-370.23.tar.bz2 1573513 SHA256 bf27b9f6239515035586b151929fc3d84def68e9171b860f9fbf205e2525d457 SHA512 6fde281d141bd2c6e9802924d3451f7e6d1d6117b6df4282f1ea3420e7c05924da68f78340dce5b03226623a54285715027f8852acdd7fb32ddadfc9142aaca0 WHIRLPOOL 287f3866f757603d67eeb970b766ca83a5bf8aebfb13b2d84cefbeffe84f2ed622bd240896964a67fb72454c7a0db369bccea49b36cc93d9b3eddc4ce4637e62
+DIST nvidia-settings-370.28.tar.bz2 1573509 SHA256 59d7818a4837144e373ce958233db059fde59e279477001e187579770ebf0c5f SHA512 c4da6ae54839a8f91d3557153a648f69095e9a486dbaaf73e453d625660f1adcada12ee5c4bccc1afe2cfd454ead13c1df0e59d5d6aa70f6065823d53f7bb461 WHIRLPOOL e5f0a9fd67e50aee42598d6a0ce9a69a162405a6121518c7aaf9ede409e9bdeb44e3102a123eb6f8c963e0fdaca429a8b693f6af2f0467e746c42f57a496d45f
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-370.23-profiles-rc.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-370.28-profiles-rc.patch
similarity index 68%
rename from x11-drivers/nvidia-drivers/files/nvidia-drivers-370.23-profiles-rc.patch
rename to x11-drivers/nvidia-drivers/files/nvidia-drivers-370.28-profiles-rc.patch
index 244b55da89b3..cec890b28ccf 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-370.23-profiles-rc.patch
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-370.28-profiles-rc.patch
@@ -1,5 +1,5 @@
---- a/nvidia-application-profiles-370.23-rc
-+++ b/nvidia-application-profiles-370.23-rc
+--- a/nvidia-application-profiles-370.28-rc
++++ b/nvidia-application-profiles-370.28-rc
 @@ -44,7 +44,7 @@
          {
            "name" : "NamedVertexAttributesApplyDivisor",
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-370.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-370.28.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-370.23.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-370.28.ebuild
index 0f5dd5c2c1ff..e776f905334f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-370.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-370.28.ebuild
@@ -170,7 +170,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-370.23-profiles-rc.patch
+	epatch "${FILESDIR}"/${P}-profiles-rc.patch
 
 	if use pax_kernel; then
 		ewarn "Using PAX patches is not supported. You will be asked to"
diff --git a/x11-libs/motif/motif-2.3.6.ebuild b/x11-libs/motif/motif-2.3.6.ebuild
index 046a92f60eb8..d7a0f94a2dc5 100644
--- a/x11-libs/motif/motif-2.3.6.ebuild
+++ b/x11-libs/motif/motif-2.3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 7ab72d60d346..66f8c8023f0e 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,3 +1,4 @@
 DIST pango-1.36.8.tar.xz 1033528 SHA256 18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 SHA512 799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215 WHIRLPOOL cb352f115a85f02061c1d1d96ad99340372a013eb9249ff2ccf6531926c26dc17b9b88572bccd40e3dbcb6f8e7a673b01ff1821a8acaa5117d96d8d6ed71707e
 DIST pango-1.38.1.tar.xz 1047372 SHA256 1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7 SHA512 7fb63dde7cef9bf791a9dc181299674caf90d80a88bca73545ee9461697b988f3927fa5aa6b36c2566c3ce917b96729b66477793f5418355e50a957aed28b529 WHIRLPOOL a120294769e891dc5153bf80a1f5e95d2cb867d9b82d932a3f8e93ccbffd7bde94426124bf4b5b42d4376175c3479b0da47e892da81a26e3c35f4b6761a013a8
 DIST pango-1.40.1.tar.xz 1051912 SHA256 e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40 SHA512 0245fca0156eb7a26ac65ae23ae026271355a506f9bd4f1c0f3a5c3ac8bb44d04561390bdf259370220aaad6d883563721bfdcb4bfa47615fad47fddfe4f620f WHIRLPOOL 215c78d3ea0717d6f4b30803d8ee9db23285f3684a1c52902d624ceacd03e2933a551ea3be858ad90ee23d29b6b5aaa05e521e5e5401a4b91c9f164583202ce9
+DIST pango-1.40.2.tar.xz 1060408 SHA256 90582a02bc89318d205814fc097f2e9dd164d26da5f27c53ea42d583b34c3cd1 SHA512 860f1f4ff0894ac4bd140d5e3b4e2f1639d1bfd2d102e7dc046fdefddc68bce63a643cd1eb90fbcd16302a380f5e0b7d3cfa509fb1819ea0d90ffbf346edabbd WHIRLPOOL ea2c266c8628a1379d207b3e29c1e3bc45323ebe6e9c061783152b177816dad3f299ddf5e6c4cfe7fc2e71075adc1ebd2357c101417738d07c60d8a5afbe052e
diff --git a/x11-libs/pango/pango-1.40.2.ebuild b/x11-libs/pango/pango-1.40.2.ebuild
new file mode 100644
index 000000000000..0abcb65da47c
--- /dev/null
+++ b/x11-libs/pango/pango-1.40.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection test"
+
+RDEPEND="
+	>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( media-fonts/cantarell )
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+multilib_src_configure() {
+	tc-export CXX
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 99b2a9dc3720..135c1647e2c2 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-3.0.tar.gz 115544 SHA256 f2c0e9c3ecb0bd1c40e952b16255c97bba184de14629b74c0203feb873a3df21 SHA512 d2debce4ba154a83b3b5155ba58c6d4b9b9754b18fdedc43769115ccf84390139c86d44d6bea30fbc4b5d065d7f4e0f8355d0f01d6e729a557597da1469d8f90 WHIRLPOOL d39bea8b88de870d3fe36b0ef06017b07aa46467fb36b2d34f4f2b41bc503a8746a81d475cf1a275b940e530351a1284683c8bf952e5bece9d07a7c3fd02d9f2
+DIST py3status-3.1.tar.gz 153768 SHA256 e172d91365e325234af433ddad37f86ca926c256af4326842a768b40d71fda23 SHA512 14345c20d9bf89919d9a52608139558ec1762bfb10756bc68a337cbd581f4307190b312ca3bdf70b538dcd65e3512df4f519ad0057940ed889c416470269a585 WHIRLPOOL cd0012fa1d89fa8849474e6f2d906d80d9c187ef81afd7eb9a369f16bd8217929527b9dc4a34c45f63fd6531cd9bee5a4b368ccaf87b4accc87fc69afe9de317
diff --git a/x11-misc/py3status/py3status-3.0.ebuild b/x11-misc/py3status/py3status-3.1.ebuild
similarity index 100%
rename from x11-misc/py3status/py3status-3.0.ebuild
rename to x11-misc/py3status/py3status-3.1.ebuild
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 9de5f230280b..a5af4ae4fbbf 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1 +1,2 @@
 DIST qt5ct-0.25.tar.bz2 45094 SHA256 b2669f4317c511895f33d5d11d14a5d9535340c6fb20effe4dd37ab6c152e057 SHA512 7fb50166c83cc15f5ad1bbdc3e6c24e53d33fb34dc2b4c0aadf4bba841f390c5d76f118e4a8cc0674728a92bb5934542ab4c03a51f865a13f378f60064b34fc7 WHIRLPOOL 40c58cb0cc30c34885f544c415e1faffeb10582f18cc9dbe36b6cae417170bf556aafa68b06773854e25b657f4ba404224f8ca16f452829c9afc94f7e0dfe955
+DIST qt5ct-0.26.tar.bz2 45383 SHA256 33883e6a12c5f9392701cc3ecc3a54181e53ce827755e8e2af8530bbc6606c5b SHA512 08d6a96acdba05450221792618808db6b7ae4e578bdc30f91b1e74615592d44b5d1e95ac1c47bcd82d28b08624a0ad0b8748d235c76cc1a7737fce736d371c10 WHIRLPOOL 3d49c8caa86f2ddc5b515add11ac2bcc9e87e7f2d397bf4d270032dc7c1096ba42ad552e9f6a85b44b51fb4f46635d595b1488ad6bfc020743422fcc0c16bc9f
diff --git a/x11-misc/qt5ct/qt5ct-0.26.ebuild b/x11-misc/qt5ct/qt5ct-0.26.ebuild
new file mode 100644
index 000000000000..45ce9297092d
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-0.26.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die
+	doenvd "${T}"/98${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		echo
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		echo
+	fi
+}
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 077a64b922b9..ad2719c2ca81 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,2 +1 @@
-DIST slock-1.2.tar.gz 4853 SHA256 3402658f890a88da3f34db04fca1783ed549ade45c2ebb8d8f0cd2b549f633b3 SHA512 0e66c5451c72a5df391a61eefa6b1a1493705fc9c0b04d9db934a56c11852c284ecca8706f47ceb1d1c8cfc5241c818c6026afb30fc9cf3938e44ea282338bee WHIRLPOOL b24a0efaa4272520f05991a7370bdbf2e34c31c58b01b900e39f2398081e829461b62c43c322fd40f0debaa491c57f768a652055341b213cc98d88680923916d
 DIST slock-1.3.tar.gz 5943 SHA256 bab4a3aea4046aa0fd0361c3649b79b90ca531bc5dfae3c4a6c0fe436152bd18 SHA512 5024588f6d25f9d72a9d2b8ef9d8a2a94e5d5e53f30f4a15df83b693a3706b1ad6550422f36af29f54429a9c516d14a349e46aeb9896c6e32009ff0da5c02a8f WHIRLPOOL 0f5d89117ad6a51f4d409f0e00b6cc114bf19e36265d8a476420fee688b224c0e9fe688d961537fbd7794c8f13df51629f7396a7e2fbc16e7b85b877b151959c
diff --git a/x11-misc/slock/files/slock-1.2-dontdieonme.patch b/x11-misc/slock/files/slock-1.2-dontdieonme.patch
deleted file mode 100644
index e4d1b464597f..000000000000
--- a/x11-misc/slock/files/slock-1.2-dontdieonme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/slock.c
-+++ b/slock.c
-@@ -57,7 +57,7 @@
- 	if (fd < 0 && errno == ENOENT)
- 		return;
- 	if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
--		die("cannot disable the out-of-memory killer for this process\n");
-+		fprintf(stderr, "cannot disable the out-of-memory killer for this process\n");
- }
- #endif
- 
diff --git a/x11-misc/slock/slock-1.2.ebuild b/x11-misc/slock/slock-1.2.ebuild
deleted file mode 100644
index ae04a409d34e..000000000000
--- a/x11-misc/slock/slock-1.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fcaps savedconfig toolchain-funcs
-
-DESCRIPTION="simple X screen locker"
-HOMEPAGE="http://tools.suckless.org/slock"
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa x86 ~x86-fbsd"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="
-	${RDEPEND}
-	x11-proto/xproto
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dontdieonme.patch
-
-	sed -i \
-		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
-		-e '/^CC/d' \
-		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
-		config.mk || die
-	sed -i \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
-	if use elibc_FreeBSD; then
-		sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die
-	fi
-	restore_config config.h
-	tc-export CC
-}
-
-src_compile() { emake slock; }
-
-src_install() {
-	dobin slock
-	save_config config.h
-}
-
-pkg_postinst() {
-	# cap_dac_read_search used to be enough for shadow access
-	# but now slock wants to write to /proc/self/oom_score_adj
-	# and for that it needs:
-	fcaps cap_dac_override,cap_sys_resource /usr/bin/slock
-
-	savedconfig_pkg_postinst
-}
diff --git a/x11-misc/slock/slock-1.3-r2.ebuild b/x11-misc/slock/slock-1.3-r2.ebuild
deleted file mode 100644
index c6a9b51bb259..000000000000
--- a/x11-misc/slock/slock-1.3-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fcaps savedconfig toolchain-funcs
-
-DESCRIPTION="simple X screen locker"
-HOMEPAGE="http://tools.suckless.org/slock"
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~x86 ~x86-fbsd"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-"
-DEPEND="
-	${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/xproto
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-warning.patch
-
-	epatch_user
-
-	sed -i \
-		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
-		-e '/^CC/d' \
-		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
-		config.mk || die
-	sed -i \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
-	if use elibc_FreeBSD; then
-		sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die
-	fi
-	restore_config config.h
-	tc-export CC
-}
-
-src_compile() { emake slock; }
-
-src_install() {
-	dobin slock
-	save_config config.h
-}
-
-pkg_postinst() {
-	# cap_dac_read_search used to be enough for shadow access
-	# but now slock wants to write to /proc/self/oom_score_adj
-	# and for that it needs:
-	fcaps cap_dac_override,cap_sys_resource /usr/bin/slock
-
-	savedconfig_pkg_postinst
-}
diff --git a/x11-misc/slock/slock-1.3-r3.ebuild b/x11-misc/slock/slock-1.3-r3.ebuild
index a60e8b93e0f1..042db78df54d 100644
--- a/x11-misc/slock/slock-1.3-r3.ebuild
+++ b/x11-misc/slock/slock-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild b/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
deleted file mode 100644
index 50167e902401..000000000000
--- a/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-		(
-			=x11-libs/gtk+-3.16*:3
-			=x11-themes/mate-themes-1.10*:0/3.16
-		)
-		(
-			=x11-libs/gtk+-3.18*:3
-			=x11-themes/mate-themes-1.10*:0/3.18
-		)
-		=x11-themes/mate-themes-1.10*:0
-	)"
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-3.ebuild b/x11-themes/mate-themes-meta/mate-themes-meta-3-r1.ebuild
similarity index 97%
rename from x11-themes/mate-themes-meta/mate-themes-meta-3.ebuild
rename to x11-themes/mate-themes-meta/mate-themes-meta-3-r1.ebuild
index c6eb49351c0d..14bb1fc2e7d3 100644
--- a/x11-themes/mate-themes-meta/mate-themes-meta-3.ebuild
+++ b/x11-themes/mate-themes-meta/mate-themes-meta-3-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="gtk2-only"
 DEPEND=""
 RDEPEND="|| (
 		gtk2-only? (
-			!!11-libs/gtk+:3
+			!!x11-libs/gtk+:3
 			x11-themes/mate-themes:0
 		)
 		(
diff --git a/x11-themes/mate-themes/Manifest b/x11-themes/mate-themes/Manifest
index 33b76cfa73bc..8301a1092683 100644
--- a/x11-themes/mate-themes/Manifest
+++ b/x11-themes/mate-themes/Manifest
@@ -1,5 +1,3 @@
-DIST mate-themes-1.10.5-gtk3.16.tar.xz 3298772 SHA256 ab754991ba2ef192db0857fe04334a5bdd6e9cbefc6cc509386a43c115b792cd SHA512 3f936b38e37f221050a48763fcd35a5f1edcd54f2e6553c0ed2538f22feba89c604219153d1176cf4039eff57a9702331d766739d2df8d17bb383ece668e3319 WHIRLPOOL 806b0f49b335ec10cdf83461d6aa187c12689432b59175dab3f66049ed8c45aa9eb8455e5989ede92c0e34d0e25838e8c309c99752b6875556af79d93e4c2d44
-DIST mate-themes-1.10.5-gtk3.18.tar.xz 3302312 SHA256 e26c100d0aaac979716d43d94957ef2fc679096f5bc3e350aac0f2d5bd966c90 SHA512 444b965bc4b713d8ff4067769ffe992bc045681ca718eca348b3193e2bf29a3961526eb19ad885641df4c7274e9e8bc477a28c41e9624b4287a04cf2ab7fb4e2 WHIRLPOOL d61bd0218737f2c404e4a981fe565490049a1ba738fa009424a9d0c3675ede0f5171a57fc3d1f2edc3d385d95878fd665929fe08f3f43eb2163a1ef3a134a86f
 DIST mate-themes-3.16.3.tar.xz 4304720 SHA256 5ab8e1d2093993c9f87061289b51c431a5a1c303793c69e1abcaa9b38dbedab8 SHA512 6edaec87c830bb88b9500ec106259e62767bc333d75bc4025866c42700c4cf8e2be0ab6c9d6b9518c5d89a5fc6cfc928eac3102c4354ef4cdd181f1e30eb5dfc WHIRLPOOL 825d309e002182fc8a59dc2a907a431b0e8d76d9918d6ca8d2a87d5f21eb54f86d4493649eecfc857cec55f7840d438e47aff7c4ba72c83aa64d5e0a97d30744
 DIST mate-themes-3.18.3.tar.xz 4326564 SHA256 c5628cf8b8e48bc3821fac68ec9d1d39f7e2b2b1f7acc23b2fa95a69e5a66f27 SHA512 7138c1e49b843116812e43ce723af57845bfef9d2e1ff7f455c57f02f613b0a8ef7da6f641ac76dbf8209207d75327c1e101f09e8ac76b4ffa497c0a6167fa39 WHIRLPOOL 6c4ea6548669dbbfcaea04cac71719ef6676321a83577ad84b6c95516ede1c75ca37aada98a514dbcc6f3fcfc943b712eb57bbfd03da6e2cabd348c67d98cf3d
 DIST mate-themes-3.20.10.tar.xz 4254436 SHA256 91c114fcb14979d88dae76a7e2e3b37f439f5daf0dd8a492c17a6174638b102e SHA512 23f3e26c914480e85a4d1792e81885f720042c46b6850bc0096cea5d59112ed22f83fa79d4fb85a96d1b4210c5021179e8ac7cd1a3cfe4f640d1573349cf0895 WHIRLPOOL d78dc5f607802be1885a4942e72b0cd7d068a60c4e87ce44f70fdf9cd65f27491befba55fb0f848b0bd972b3925c0d54dcc28dc49c66e9ccb911f3e88ac6181e
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild
deleted file mode 100644
index 13aa46c1faca..000000000000
--- a/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-MATE_GTK_V="$(get_version_component_range 4- ${PVR})"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V:1:2} + 1 ))" #variable to allow negation of =$P-1*
-MATE_GTK_V="3.${MATE_GTK_V:1:2}"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${PN}-gtk${MATE_GTK_V}-${PV}.tar.xz ->
-	${P}-gtk${MATE_GTK_V}.tar.xz"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${MATE_GTK_V}"
-KEYWORDS="amd64 ~arm x86"
-
-S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild
deleted file mode 100644
index 13aa46c1faca..000000000000
--- a/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-MATE_GTK_V="$(get_version_component_range 4- ${PVR})"
-MATE_GTK_NV="3.$(( ${MATE_GTK_V:1:2} + 1 ))" #variable to allow negation of =$P-1*
-MATE_GTK_V="3.${MATE_GTK_V:1:2}"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${PN}-gtk${MATE_GTK_V}-${PV}.tar.xz ->
-	${P}-gtk${MATE_GTK_V}.tar.xz"
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${MATE_GTK_V}"
-KEYWORDS="amd64 ~arm x86"
-
-S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2:2
-	!<x11-libs/gtk+-${MATE_GTK_V}:3
-	!>=x11-libs/gtk+-${MATE_GTK_NV}:3
-	>=x11-themes/gtk-engines-2.15.3:2
-	x11-themes/gtk-engines-murrine"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35:*
-	sys-devel/gettext:*
-	>=sys-devel/autoconf-2.53:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch b/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch
new file mode 100644
index 000000000000..ae78995d46fb
--- /dev/null
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch
@@ -0,0 +1,22 @@
+Index: qtcurve-1.8.18/lib/utils/color.h
+===================================================================
+--- qtcurve-1.8.18.orig/lib/utils/color.h
++++ qtcurve-1.8.18/lib/utils/color.h
+@@ -250,7 +250,7 @@ qtcColorTint(const QColor *base, const Q
+         return *base;
+     } else if (amount >= 1.0) {
+         return *col;
+-    } else if (isnan(amount)) {
++    } else if (std::isnan(amount)) {
+         return *base;
+     }
+     const QtcColor qtc_base = {base->redF(), base->greenF(), base->blueF()};
+@@ -267,7 +267,7 @@ qtcColorMix(const QColor *c1, const QCol
+         return *c1;
+     } else if (bias >= 1.0) {
+         return *c2;
+-    } else if (isnan(bias)) {
++    } else if (std::isnan(bias)) {
+         return *c1;
+     }
+     const QtcColor qtc_c1 = {c1->redF(), c1->greenF(), c1->blueF()};
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
index eaa3aced377a..335092fbfcb3 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
@@ -55,6 +55,7 @@ PATCHES=(
 	"${DISTDIR}/${P}-dont_use_c++11.patch"
 	"${FILESDIR}/${P}-remove_qt_filedialog_api.patch"
 	"${FILESDIR}/${P}-gtk2_segfault.patch"
+	"${FILESDIR}/${P}-std_isnan.patch"
 	)
 
 pkg_setup() {
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index ea649a6deed1..ea40610e7d43 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,3 +1,4 @@
 DIST xfce4-notifyd-0.2.4.tar.bz2 361619 SHA256 8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0 SHA512 4cee6395ee925e41ec22baa0fca21b38261a547ddff32f6c140db91996e2aa39b86113ffbe42da3c98728513a10eadd99504a05f31100762eb5b19bf8a74ae7c WHIRLPOOL d3e33bae0292852f8645a83d469e0fc093edbc038210aec7f02a879aa28cce81b95ab937a63d890f3f5177008c070721d488076272705a76b66cafedf9f65919
 DIST xfce4-notifyd-0.3.0.tar.bz2 427170 SHA256 7076081424932b40d03366a7518daf495f81eb780f376819e59e76d65d811100 SHA512 774eb0daf935fcf3fdb8a40b03ef772b45c4b12408a5e84aff57c0e8c8490c0f3ec4753893dd07a31b7e8094fd065a8a86f56f2e6217ddd6432a8eda0dcb9f9f WHIRLPOOL fcba9a42ca476deec27d12e80953a87ca073418706cd282bfbcda96e3c058e3dbe87ef2fced6a679c96c72485067439020a0ef49548c6172eb4401c7141c94a6
 DIST xfce4-notifyd-0.3.1.tar.bz2 429056 SHA256 ef02b7e0101034df19ca5dddae387a2625e46380f0d2af3b4f4713c219d1f863 SHA512 3c06e505b12923169e154af2e4a8634d03da8681456bd925192c21674a3dde4018153657537b1bc63a666fb870e8c62b357a264b0bfc02d2ae7cfc526f5cd632 WHIRLPOOL f712a6ab49c34854789ff306ac36059d1ddbc15df6bb8d76ad87660b6a075e1d121d96c1ce4a3a43cad70ceb96d89f27716a797ae697cf8da8f2e0cae95f3a2a
+DIST xfce4-notifyd-0.3.2.tar.bz2 431023 SHA256 c554db55d9d759c32115e9e5da029bd68b07628438ef2bac7ae4b458567c85a4 SHA512 1e1d3d52b3d451670dd0529031cee762be99bdfbc15877ef8360d4794a7b56198ce6d2b75943ed9c8b6cd00457600fc083e63d73f2ba5546bd6c8b511772481c WHIRLPOOL 1d36ec91ae31dfe3aa2428b0f3072d5a23fb28d9b86ad937604faea51408f2247239a37d9f108ca0a79262f329a233755ba5593e4b4f273bb8d2dbf7abb51f96
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild
new file mode 100644
index 000000000000..6434b5944154
--- /dev/null
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Notification daemon for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.42:2=
+	>=x11-libs/gtk+-3.14:3=
+	>=x11-libs/libnotify-0.7:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfconf-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS NEWS README TODO )
+}