diff --git a/app-admin/glance/files/2014.2.2-CVE-2015-1881.patch b/app-admin/glance/files/2014.2.2-CVE-2015-1881.patch
new file mode 100644
index 000000000000..f7c40b3c863b
--- /dev/null
+++ b/app-admin/glance/files/2014.2.2-CVE-2015-1881.patch
@@ -0,0 +1,93 @@
+From 25a722e614eacc47e4658f0bca6343fa52f7d03f Mon Sep 17 00:00:00 2001
+From: abhishekkekane <abhishek.kekane@nttdata.com>
+Date: Thu, 12 Feb 2015 04:09:14 -0800
+Subject: [PATCH] Image data remains in backend for deleted image
+
+Trying to delete image created using task api (import-from) image gets
+deleted from the database, but image data remains in the backend. Import
+task does not update the location of the image and it remains None even
+image becomes active. Location entry is not added in the database in
+image_locations table.
+
+Added location information to the image before saving the image in
+the database.
+
+SecurityImpact
+
+Conflicts:
+	glance/common/scripts/image_import/main.py
+
+Change-Id: Ie389de6538a9b98dc51c7d781b81b3ab10b83842
+Closes-Bug: #1420696
+(cherry picked from commit 78b5b0a9575cd5e9c4543ec0e8fd6072af1f0ebb)
+---
+ glance/common/scripts/image_import/main.py         | 30 +++++++++++-----------
+ .../unit/common/scripts/image_import/test_main.py  |  3 ++-
+ 2 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/glance/common/scripts/image_import/main.py b/glance/common/scripts/image_import/main.py
+index 24dd52b..72c992e 100644
+--- a/glance/common/scripts/image_import/main.py
++++ b/glance/common/scripts/image_import/main.py
+@@ -84,29 +84,29 @@ def import_image(image_repo, image_factory, task_input, task_id, uri):
+     # NOTE: set image status to saving just before setting data
+     original_image.status = 'saving'
+     image_repo.save(original_image)
+-    set_image_data(original_image, uri, None)
+-
+-    # NOTE: Check if the Image is not deleted after setting the data
+-    # before setting it's status to active. We need to set the status
+-    # explicitly here using the Image object returned from image_repo .The
+-    # Image object returned from create_image method does not have appropriate
+-    # factories wrapped around it.
+     image_id = original_image.image_id
++
++    # NOTE: Retrieving image from the database because the Image object
++    # returned from create_image method does not have appropriate factories
++    # wrapped around it.
+     new_image = image_repo.get(image_id)
+-    if new_image.status in ['saving']:
+-        new_image.status = 'active'
+-        new_image.size = original_image.size
+-        new_image.virtual_size = original_image.virtual_size
+-        new_image.checksum = original_image.checksum
++    set_image_data(new_image, uri, None)
++
++    # NOTE: Check if the Image is not deleted after setting the data
++    # before saving the active image. Here if image status is
++    # saving, then new_image is saved as it contains updated location,
++    # size, virtual_size and checksum information and the status of
++    # new_image is already set to active in set_image_data() call.
++    image = image_repo.get(image_id)
++    if image.status == 'saving':
++        image_repo.save(new_image)
++        return image_id
+     else:
+         msg = _LE("The Image %(image_id)s object being created by this task "
+                   "%(task_id)s, is no longer in valid status for further "
+                   "processing." % {"image_id": new_image.image_id,
+                                    "task_id": task_id})
+         raise exception.Conflict(msg)
+-    image_repo.save(new_image)
+-
+-    return image_id
+ 
+ 
+ def create_image(image_repo, image_factory, image_properties, task_id):
+diff --git a/glance/tests/unit/common/scripts/image_import/test_main.py b/glance/tests/unit/common/scripts/image_import/test_main.py
+index 27f502b..a81a66c 100644
+--- a/glance/tests/unit/common/scripts/image_import/test_main.py
++++ b/glance/tests/unit/common/scripts/image_import/test_main.py
+@@ -56,7 +56,8 @@ class TestImageImport(test_utils.BaseTestCase):
+                     image_id,
+                     image_import_script.import_image(image_repo, image_factory,
+                                                      task_input, None, uri))
+-                self.assertEqual('active', image.status)
++                # Check image is in saving state before image_repo.save called
++                self.assertEqual('saving', image.status)
+                 self.assertTrue(image_repo.save.called)
+                 mock_set_img_data.assert_called_once_with(image, uri, None)
+                 self.assertTrue(image_repo.get.called)
+-- 
+2.0.5
+
diff --git a/app-admin/glance/glance-2014.2.2.ebuild b/app-admin/glance/glance-2014.2.2-r1.ebuild
similarity index 98%
rename from app-admin/glance/glance-2014.2.2.ebuild
rename to app-admin/glance/glance-2014.2.2-r1.ebuild
index 28140ce6e116..5a5d7877b6e1 100644
--- a/app-admin/glance/glance-2014.2.2.ebuild
+++ b/app-admin/glance/glance-2014.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.2.ebuild,v 1.1 2015/02/08 01:51:56 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.2-r1.ebuild,v 1.1 2015/03/09 01:28:07 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -112,6 +112,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch"
+	"${FILESDIR}/2014.2.2-CVE-2015-1881.patch"
 )
 
 pkg_setup() {
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 092e47434dc0..34ccc045ba5a 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,3 +1,4 @@
 DIST Rex-0.55.1.tar.gz 242848 SHA256 cb45b2e6aba133fddc9a2bf11d4d6decdd62f1e8edfce8f3bd54b7e42ea0f57d SHA512 2d438117128b316fcf37dd9060f0f506d9485b10ae75903cde75abd7692e96404f16b75904c1089cd07487992b862b74637589500cd7a3336d235da000a0506e WHIRLPOOL 0a6f8b98b631fa0721731d03478a8fca22d27322645293d2c1d48704698f65f883a8302c473e5d297f1314200c196a0597a352bbb76670ac2451d1c7940a3dad
 DIST Rex-0.56.0.tar.gz 262842 SHA256 c50f7014bbc8ebf0a92f5f8c57239018f1c764034948bbc483e618b908672e88 SHA512 32a36d96eefc6d801562ded928a2d3227577e30c7ac8270cc40574b602072e270f5e64c949297ed463b779c8e606231ce0de250acae729767bb042d7d1fa9c9d WHIRLPOOL 409f5c56955152d34eb336e64d4915b78d4c9b5fdeef73d4052019661dec6833f8c7da41b3cc6b529c26497c225032c7f58e9a542cdccaa6412085c25374a1b3
 DIST Rex-0.56.1.tar.gz 263079 SHA256 ef655b16149b048302c27b6a5b3ad767623c7c81be5d2f851dd853ce397645fd SHA512 793960958d0a5b601f59d888fdd4e06d55664a9f75e9c26482abb1acf2701143505d460b5d8b5aa46f6f950d9174bcfc5534f925f7629da0b5e10e9d9e58b92f WHIRLPOOL 86121a6f3fe0f6953c9d0f491167b6f72d3dd6daeca78f998d82e93d272d8f6cca9466a0d09c7dea5f561cc20b8798b02f9be3b7ac25dd61af9743b29d77b8c7
+DIST Rex-1.0.0.tar.gz 261873 SHA256 894ba5128842b33cbc5dfeabdbeded18f303d2efbb082d08c9fceb38a7a0217b SHA512 53eb51e88e466f9dc429da828e3745c074eac1e1f1ba02f5c4f058358f071cd6eb71a95d56f65bd9b0e142aa824b2c660b7e7fe83c9ecd742dec12c3a4b642d4 WHIRLPOOL dc6b0dcd6ef3b1de4a7839a47054481b036bbd5395702c110e7760173797428b24d198bd50d8975045bd740a6180278bc34eef57c827e4d6a17a316577f16608
diff --git a/app-admin/rex/rex-1.0.0.ebuild b/app-admin/rex/rex-1.0.0.ebuild
new file mode 100644
index 000000000000..8fee1fc12f6f
--- /dev/null
+++ b/app-admin/rex/rex-1.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rex/rex-1.0.0.ebuild,v 1.1 2015/03/09 03:02:07 patrick Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=JFRIED
+MODULE_VERSION=0.53.1
+MODULE_A=Rex-${PV}.tar.gz
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Net-SSH2"
+DEPEND="${RDEPEND}
+	dev-perl/JSON-XS
+	dev-perl/XML-Simple
+	dev-perl/Digest-SHA1
+	dev-perl/Digest-HMAC
+	dev-perl/Expect
+	dev-perl/DBI
+	dev-perl/yaml
+	dev-perl/libwww-perl
+	dev-perl/String-Escape
+	dev-perl/List-MoreUtils
+	dev-perl/Parallel-ForkManager
+	dev-perl/Text-Glob"
+
+SRC_TEST="do"
+
+S="${WORKDIR}/Rex-${PV}"
diff --git a/app-admin/supervisor/supervisor-3.1.3.ebuild b/app-admin/supervisor/supervisor-3.1.3.ebuild
index 04109e440303..76c749e29591 100644
--- a/app-admin/supervisor/supervisor-3.1.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.3.ebuild,v 1.2 2015/03/06 22:03:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.3.ebuild,v 1.3 2015/03/08 23:37:29 pacho Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 # ALL versions of meld3 match to >=meld3-0.6.5 
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 57565fc3f744..d069a48c3f9c 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1 +1,2 @@
 DIST mousepad-0.3.0.tar.bz2 481125 SHA256 10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d SHA512 4e8f7cd8f05265c7f3964f0f5196721136c501351aa8c7bae1e3a6056fcd61f40364f2bb226817d458afa3707334dd600efbae2f8d050d65841ef03085717e42 WHIRLPOOL ed3582231bca8d3ea1f5a4adaf6279cd48d3628ba1154db80c6fb037b0efacbaf7535dad9bb4631982cfa5ee73514a628c340cb017514b0ab29d028b3c974b1c
+DIST mousepad-0.4.0.tar.bz2 578483 SHA256 60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe WHIRLPOOL dd087f38d75836d28cdae3a851d2ede0246a66db104710bab919928d32b63e470c95d77ff09c34c92e90322f14d5f85f83dc913acc529b8dd95ad8bc2712b9c1
diff --git a/app-editors/mousepad/metadata.xml b/app-editors/mousepad/metadata.xml
index d56729e92f8e..f2d9e5bd83fd 100644
--- a/app-editors/mousepad/metadata.xml
+++ b/app-editors/mousepad/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>xfce</herd>
+  <use>
+    <flag name='gtk3'>Use GTK+3 instead of GTK+2</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-editors/mousepad/mousepad-0.4.0.ebuild b/app-editors/mousepad/mousepad-0.4.0.ebuild
new file mode 100644
index 000000000000..c886381f6b0e
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mousepad/mousepad-0.4.0.ebuild,v 1.2 2015/03/09 17:21:18 zerochaos Exp $
+
+EAPI=5
+inherit gnome2-utils xfconf
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/start"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dbus gtk3"
+
+RDEPEND=">=dev-libs/glib-2.30:2=
+	dbus? ( >=dev-libs/dbus-glib-0.100:0= )
+	!gtk3? ( >=x11-libs/gtk+-2.24:2=
+		x11-libs/gtksourceview:2.0= )
+	gtk3? ( x11-libs/gtk+:3=
+		x11-libs/gtksourceview:3.0= )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		$(xfconf_use_debug)
+		$(use_enable dbus)
+		$(use_enable gtk3)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+pkg_preinst() {
+	xfconf_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/app-emulation/cloud-init/cloud-init-0.7.6.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6.ebuild
index 27f22a6c428b..b157a8513c9e 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/cloud-init-0.7.6.ebuild,v 1.2 2015/03/06 22:04:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/cloud-init-0.7.6.ebuild,v 1.3 2015/03/08 23:37:34 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/app-misc/yworklog/yworklog-0.0.7.ebuild b/app-misc/yworklog/yworklog-0.0.7.ebuild
index e92fe842f32d..230ec95df55a 100644
--- a/app-misc/yworklog/yworklog-0.0.7.ebuild
+++ b/app-misc/yworklog/yworklog-0.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/yworklog/yworklog-0.0.7.ebuild,v 1.2 2015/03/06 22:04:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/yworklog/yworklog-0.0.7.ebuild,v 1.3 2015/03/08 23:37:38 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/sqlalchemy
 	dev-python/cement[${PYTHON_USEDEP}]
diff --git a/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild b/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild
index aa028828eb76..72e84b01b81a 100644
--- a/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild
+++ b/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild,v 1.4 2015/03/06 22:04:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/lightblue/lightblue-0.4-r1.ebuild,v 1.5 2015/03/08 23:37:42 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/app-office/texmaker/texmaker-4.4.1.ebuild b/app-office/texmaker/texmaker-4.4.1.ebuild
index 4781d6531ef2..b9e678fcc9a0 100644
--- a/app-office/texmaker/texmaker-4.4.1.ebuild
+++ b/app-office/texmaker/texmaker-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 1.5 2015/03/02 09:04:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 1.6 2015/03/09 17:26:44 jlec Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="qt4 qt5"
+IUSE="+qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 2b3b8cbcdfd4..cc1c724f84ff 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,3 +1,4 @@
 DIST texstudio-2.8.4.tar.gz 25126093 SHA256 b4a867f9cce1af962069f4429bc774e30b0f7d79b4297b71667ab5b8fa2d9e3f SHA512 f27a7eb0bad205d8a8155c40ce95d5a45565c261267073200d91430bb982385fced21dcaf0d2a43c554cc9194ea6a511ae7e2147584c20b67c075a0f298452cd WHIRLPOOL 333b1c3409e9e645eaae7773d2b5556b931ff9763211c242570711f6630411f316bbd0d7dd91613106b88a74ef0eba3c198c69bd295224b63d2d2ad69fa046e3
 DIST texstudio-2.8.6.tar.gz 25183578 SHA256 b665040c34ad6cd98d8f6e041393028f115da4dfb5bb8829b49dfa5a96fa755f SHA512 af8b4dd54c57c1f34fc316095075c3beee13f323cef0db9b364e7c929ff6d7bfe1d6d66bd7e6bf1127b8394ad6e452510248e11b5c009d6ffba355edffdf064d WHIRLPOOL 6707398bb405c820c3e0591bc0a0f58ad152f01950c4aa4a4a4aeba12d078f29087ef5dac3274f745ebf26c17049bc1dc168b51c53c8a6e9a1626eae41994413
 DIST texstudio-2.8.8.tar.gz 25198033 SHA256 5d00c42425c0d1464438c0c1701508fef281f5dbdd0fbcebdbba9de60ac6db95 SHA512 b4f50368ac4a145ad6cb6c764d2d84ac0c3b0b08903b53390e34fb3a8d2e2c12b72cdf77cf97ea22df94a29438be6db3004f8663e04c5254ae40bf28bc2be152 WHIRLPOOL 08d4af41163ebfa85539001fe540a5f48b86e341d93983a42da03015d00460b30280f5fa08c50c90c97d7e1ed38d324efea666c6640b6bba421cffd832031e27
+DIST texstudio-2.9.0.tar.gz 25296387 SHA256 e984ebc4393de13d9f20f474ce88382d587b2f8d0fb741f606a790a8f84a974a SHA512 5985162bd9695e1c5b4377e8230e4bc41de0becc0b41dc8d23f428824d58ea91eb83dd52d2546c457350b039423ab6e4f6ae7d8fffcb701345d0c3f8f02da5b4 WHIRLPOOL 2e3ae47c585ca452a5bf822c9e4da8ad6204ee2273753c21f87a04f65f2d166c3bc5936502a2c9de83e6446ecad2587ccdb223820d4968f60918cf63ebf85c73
diff --git a/app-office/texstudio/texstudio-2.9.0.ebuild b/app-office/texstudio/texstudio-2.9.0.ebuild
new file mode 100644
index 000000000000..3a8ffb5bdfa4
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.9.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.9.0.ebuild,v 1.2 2015/03/09 17:28:38 jlec Exp $
+
+EAPI=5
+
+inherit base fdo-mime prefix qmake-utils
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="http://texstudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video +qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4?,qt5?]
+	>=dev-libs/quazip-0.7.1[qt4?,qt5?]
+	dev-qt/qtsingleapplication[qt4?,qt5?]
+	x11-libs/libX11
+	x11-libs/libXext
+	qt4? (
+		dev-qt/designer:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtcore-4.6.1:4
+		>=dev-qt/qtscript-4.6.1:4
+		>=dev-qt/qtsvg-4.6.1:4
+		>=dev-qt/qttest-4.6.1:4
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtscript:5
+		dev-qt/qtsvg:5
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+	)
+	video? ( media-libs/phonon[qt4?,qt5?] )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/-/}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch
+	"${FILESDIR}"/${PN}-2.8.2-desktop.patch
+# Get it from fedora
+	"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
+	)
+
+src_prepare() {
+	find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/hunspell.pri/d' \
+		-e '/quazip.pri/d' \
+		-e '/qtsingleapplication.pri/d' \
+		-e '/QUAZIP_STATIC/d' \
+		-i ${PN}.pro || die
+
+#	cat >> ${PN}.pro <<- EOF
+#	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+#	EOF
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+
+	epatch ${PATCHES[@]}
+}
+
+src_configure() {
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		insinto /usr/share/icons/hicolor/${i}
+		newins utilities/${PN}${i}.png ${PN}.png
+	done
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 00183003503a..820deaa234a9 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -1,3 +1,2 @@
-DIST djview-4.7.tar.gz 876307 SHA256 2c5df0f96031e2f4b1b1c05728396e918a404f715f981da7ab6fbb0ee7c8ef2d SHA512 312abbe02dcef49e8deb7251a333efdfbcbdbd7aab31e2a0037cbd20acab148bb05a31b9fb1020fb825cafe6b6ca9509740970ff1bc2ea7931c98ae5070f24ec WHIRLPOOL e56d24ad87a5468208a3d0002d006662732533224ac020b4a909ce9ddc79a45f773bdb9ecf5b2c09fc8084961f0b398d77c3e47d6a35d4d0512951a45e740892
-DIST djview-4.8.tar.gz 883481 SHA256 8c746e7c2945ca6e08046b49d0d0aeca95d389d82365cd71111025b9d796c89f SHA512 21bdf30bd4b63f95fe0bb25650c08defc43bdd3041122c7c78a93268942d0e2e92822a78a8e101e35f50c363a3b3ce5dd31d6ff1c19c163833d086bd8422402c WHIRLPOOL 028f2d865c03e61cc341bcea368f2b3cc4689108d0ceabbc6830cb1f1160f444838125a8551576c50cffc6908ca8dd791527bbf5eb3d5bacc9bcd965c9d9eb69
+DIST djview-4.10.tar.gz 1077198 SHA256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f SHA512 b3755992df2000f088a93c0d77d4a2ea62f6495f67106142d4787b94d248c54561068a40700c18325c0977a057b26948762a7b71c392b0ccef455776dcb0aad0 WHIRLPOOL 179d850a994521c02a7c64e17aa8d5c618011e8a765023325bc86e19f8b7797ac1f70962b1ccb9438b3a853463c797698a29d09f937317fa0ab0ac65b5016f29
 DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd
diff --git a/app-text/djview/djview-4.8.ebuild b/app-text/djview/djview-4.10.ebuild
similarity index 76%
rename from app-text/djview/djview-4.8.ebuild
rename to app-text/djview/djview-4.10.ebuild
index ec3c04caf304..2933dca08023 100644
--- a/app-text/djview/djview-4.8.ebuild
+++ b/app-text/djview/djview-4.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.8.ebuild,v 1.12 2013/10/01 21:16:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.10.ebuild,v 1.1 2015/03/09 08:06:56 aballier Exp $
 
 EAPI=4
 
-inherit autotools eutils gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
 
 MY_P=${PN}-$(replace_version_separator 2 '-')
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug nsplugin"
 
 RDEPEND="
@@ -26,11 +26,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nsplugin? ( dev-libs/glib:2 )"
 
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt48.patch
-
 	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
 	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
 	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
@@ -63,11 +59,12 @@ src_install() {
 
 	cd desktopfiles
 	insinto /usr/share/icons/hicolor/32x32/apps
-	newins hi32-djview4.png djvulibre-djview4.png
+	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
 	insinto /usr/share/icons/hicolor/64x64/apps
-	newins hi64-djview4.png djvulibre-djview4.png
+	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
 	insinto /usr/share/icons/hicolor/scalable/apps
 	newins djview.svg djvulibre-djview4.svg
+	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
 	domenu djvulibre-djview4.desktop
 }
 
diff --git a/app-text/djview/djview-4.7.ebuild b/app-text/djview/djview-4.7.ebuild
deleted file mode 100644
index 48d3447aed0e..000000000000
--- a/app-text/djview/djview-4.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djview/djview-4.7.ebuild,v 1.11 2013/03/02 19:41:41 hwoarang Exp $
-
-EAPI="4"
-
-inherit eutils autotools versionator toolchain-funcs multilib nsplugins fdo-mime flag-o-matic
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Portable DjVu viewer using Qt4"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
-	>=app-text/djvu-3.5.22-r1
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.67
-	virtual/pkgconfig
-	nsplugin? ( dev-libs/glib:2 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_prepare() {
-	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
-	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
-	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
-	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	# See config/acinclude.m4
-	use debug || append-cppflags "-DNDEBUG"
-
-	# QTDIR is needed because of kde3
-	QTDIR=/usr \
-	econf \
-		--with-x \
-		$(use_enable nsplugin nsdejavu) \
-		--disable-desktopfiles
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
-			install
-
-	dodoc README NEWS
-
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins hi32-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins hi64-djview4.png djvulibre-djview4.png
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins djview.svg djvulibre-djview4.svg
-	domenu djvulibre-djview4.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-text/djview/files/djview-4.8-qt48.patch b/app-text/djview/files/djview-4.8-qt48.patch
deleted file mode 100644
index 4db289291ede..000000000000
--- a/app-text/djview/files/djview-4.8-qt48.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Leon Bottou <leon@bottou.org>
-Date: Mon, 2 Apr 2012 14:11:36 +0000 (-0700)
-Subject: removed swap (use qSwap instead).
-X-Git-Tag: release.4.9~5
-X-Git-Url: http://djvu.git.sourceforge.net/git/gitweb.cgi?p=djvu%2Fdjview.git;a=commitdiff_plain;h=7d4802964b9e74506c63f43505b632f6e7b5db3c;hp=6389dcba572c6439acd226d27872c2f0db583875
-
-removed swap (use qSwap instead).
-
-Fixes Gentoo bug 401517, compilation problems with qt-4.8.
-Unclear why is namespace std in scope at this point when using qt-4.8...
----
-
-diff --git a/src/qdjvuwidget.cpp b/src/qdjvuwidget.cpp
-index 52ac366..8136d07 100644
---- a/src/qdjvuwidget.cpp
-+++ b/src/qdjvuwidget.cpp
-@@ -152,15 +152,6 @@ all_numbers(const char *s)
-   return true;
- }
- 
--template<class T> static inline void 
--swap(T& x, T& y)
--{
--  T tmp;
--  tmp = x;
--  x = y;
--  y = tmp;
--}
--
- template<class T> static inline int
- ksmallest(T *v, int n, int k)
- {
-@@ -173,11 +164,11 @@ ksmallest(T *v, int n, int k)
-       /* Sort v[lo], v[m], v[hi] by insertion */
-       m = (lo+hi)/2;
-       if (v[lo]>v[m])
--        swap(v[lo],v[m]);
-+        qSwap(v[lo],v[m]);
-       if (v[m]>v[hi]) {
--        swap(v[m],v[hi]);
-+        qSwap(v[m],v[hi]);
-         if (v[lo]>v[m])
--          swap(v[lo],v[m]);
-+          qSwap(v[lo],v[m]);
-       }
-       /* Extract pivot, place sentinel */
-       pivot = v[m];
-@@ -191,7 +182,7 @@ ksmallest(T *v, int n, int k)
-       do ++l; while (v[l]<pivot);
-       do --h; while (v[h]>pivot);
-       if (l < h) { 
--        swap(v[l],v[h]); 
-+        qSwap(v[l],v[h]); 
-         goto loop; 
-       }
-       /* Finish up */
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 1697445af9ad..e8342e17f4c4 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1 +1,2 @@
 DIST djvulibre-3.5.25.3.tar.gz 2543949 SHA256 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b WHIRLPOOL 43ce341be7dd6322f7bf05ed541e9eb6b8b923d95893bb8f8b78761ae452384e39c39e23723b4d0fc7fe8e95301dc414ac9c2d74a169a6ae12b86e5968f1edc3
+DIST djvulibre-3.5.27.tar.gz 3648522 SHA256 e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee WHIRLPOOL 7caff93eeaaaccb393c03013b62220cfc1b1a50e4d6da4a107ae0267fed1f5f9e6d3ad2b61845be5192b67917ec064a2c21c0f4ad567d4b0d6f56168ae4593bc
diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
new file mode 100644
index 000000000000..42d2f059a3e8
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.27.ebuild,v 1.1 2015/03/09 07:57:23 aballier Exp $
+
+EAPI=5
+inherit eutils fdo-mime flag-o-matic
+
+MY_P="${PN}libre-${PV#*_p}"
+
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="http://djvu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}
+	|| ( gnome-base/librsvg media-gfx/inkscape )"
+
+S=${WORKDIR}/${MY_P%%.3}
+
+src_configure() {
+	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+	# We install all desktop files by hand.
+	econf \
+		$(use_enable xml xmltools) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		--disable-desktopfiles
+}
+
+DOCS=( NEWS README )
+
+src_install() {
+	default
+	prune_libtool_files
+
+	use doc && dodoc -r doc
+
+	# Install desktop files.
+	cd desktopfiles
+	for i in {22,32,48,64}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
+	done
+	insinto /usr/share/mime/packages
+	doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	if ! has_version app-text/djview; then
+		elog "For djviewer or browser plugin, emerge app-text/djview."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index c31d07497751..09eb08fc9bef 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1 +1,2 @@
 DIST dvipng-1.14.tar.gz 173686 SHA256 43f5b57d0fab29398dcec1b849e8bebbcacb0b9c06875d2ac84a049be3c5b350 SHA512 d7dda0e83ec93c0ebb9c970f2464ed1b04cdd41c178165db6da7c37b90810f3be0a513b9a43162563cb5ca15a7dec3c12a49f27abeb44fca3739090661ab53ba WHIRLPOOL 5510c41343ddc4f628eaac44b47e1e865b964d043ebf920706098f98e9f56d4557553487c15fd1931ea862350b1984f2276a37bd85ed60fb9a0b2caaa7293bc6
+DIST dvipng-1.15.tar.gz 171529 SHA256 197e9fd0f87ede32dc4bc1d39ec2cd72fa5260856f9d0dc2d8e6895130408347 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c WHIRLPOOL 4c0c5e410b107cd6cb56f9360acd556ae4336855d0624800d96e46cd29caead0467bc554d3d1c404e4564a3ce7b3732386f6af93ea98312c6b17745582f4ef92
diff --git a/app-text/dvipng/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild
new file mode 100644
index 000000000000..c49819571731
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipng/dvipng-1.15.ebuild,v 1.1 2015/03/09 07:44:39 aballier Exp $
+
+EAPI=5
+
+DESCRIPTION="Translate DVI files into PNG or GIF graphics"
+HOMEPAGE="http://dvipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="truetype test"
+
+RDEPEND="
+	dev-libs/kpathsea
+	media-libs/gd[jpeg,png]
+	media-libs/libpng:0=
+	virtual/latex-base
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2.1.5 )"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	test? ( dev-texlive/texlive-fontsrecommended )"
+
+DOCS="ChangeLog README RELEASE"
+
+src_configure() {
+	if ! use truetype; then
+		sed -i -e 's/FT_Init_FreeType/dIsAbLe&/' configure || die "sed failed"
+	fi
+
+	export VARTEXFONTS="${T}/fonts"
+	econf
+}
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
index 322cf2313eaa..23fd1b85950a 100644
--- a/app-text/pdfminer/pdfminer-20140328.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfminer/pdfminer-20140328.ebuild,v 1.2 2015/03/06 22:04:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdfminer/pdfminer-20140328.ebuild,v 1.3 2015/03/08 23:37:46 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 python_compile_all(){
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
index c98c79c37cf5..fd2246ecabad 100644
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/pylize-1.3b-r1.ebuild,v 1.5 2015/03/06 22:04:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/pylize-1.3b-r1.ebuild,v 1.6 2015/03/08 23:37:50 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -15,7 +15,7 @@ SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
 IUSE="doc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-python/empy[${PYTHON_USEDEP}]
 	virtual/python-imaging[${PYTHON_USEDEP}]"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 2c6c00af5f82..eaf353ed760d 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -8,6 +8,7 @@ DIST texlive-core-patches-42.tar.xz 2508 SHA256 e3b4d4de520ff58420a7b695491ffd78
 DIST texlive-core-patches-43.tar.xz 3468 SHA256 01d9b08947a8fb8699724c90307a2450394f3de78ea269d7e5494c67f30dadd4 SHA512 bf169aa8cc7b01fdfe8a24f7f51aae430c9b1dccf0ba8daa365bca72fe68735d4b604ffbffd4c2e5198180bbf3eb789be5c36ee304e33b6f59896c0b3564ce03 WHIRLPOOL e38cedc8da12b1b0d48a64a7b57ebac0e440240dfebe27872c359faa1ad828b1cc1450a662e9cf9751c882d69edfd566e8a01ed0ee486114fdcd8e3d8b0374bd
 DIST texlive-core-patches-44.tar.xz 2752 SHA256 e5699150b1ccb4784990bd0c796337b24b38cbd0ab8d2461f1aec5db07932a9a SHA512 a23cbd60ae6c80ea28e76ae5687f7ea73514e0dc9629012176ce8229ba4bd693227f3ceb7ea407e6df086030882b6cec7d69ac302a6f3e64fa1c9f171de3b472 WHIRLPOOL b30995744fdf06a462348b93657e06ee8720dee5559f8dffc3144b90a18d2264eb170316b4de943d4285647f78ece05f95c83e00b80e0f4dfd287bf28f0de3ca
 DIST texlive-core-patches-45.tar.xz 2876 SHA256 0da1bd87ffa453cda9e23f68e5ecd26742049839e13efc0ca8be488bf0919880 SHA512 08d2643bc6215198d5eec586f892005be930248d491ae83a2c4f6b573ff7281db1d2d36e98eed8db15d29c669e8f5ca3041d9308633502302202f43da351927d WHIRLPOOL d86c2e52ad392bcbf1f2e5049ecd3fb7ce4f7e4dd57394f977bcaca94d81672b46699c0d78c7e72ef0ecc6829c46f9efadc137be56683bfe449a001c8772edaf
+DIST texlive-core-patches-46.tar.xz 2840 SHA256 133a6970b931713f243aa1ca64364379e613576ed3d417e88b39777cd43fdccc SHA512 f6658e6b6e1d43d1e9740696ae0c00e2a8247c5070f50973ee36e59f427d0020c0a5c90d1e178456dd77f93b683333744a9832b2138958848ee3ff2aac441389 WHIRLPOOL bdd4c323ecde7478aca57c30ee06ee3a8ad03c87aff3eff21ad08355429a371287bb0104ef3b6f02549eb2a554c82729689dcc106ecc6ca1869859baf206166c
 DIST texlive-module-a2ping-2012.tar.xz 31124 SHA256 37b769091af7c7c9f95c52f92cbc26b22f72dc0de5ecb0e9e37cf1482438605a SHA512 b4f74f037d1113d204d3f0e34c8418e354ae002ab09e8c326458bf7c9c9a9bfa3211317e03bb7e69d7f2e83a2b22851410287477176dab5288dacf5a9ec4a8a6 WHIRLPOOL 5e76ab0e818c3e20d8211c35230a9ee1084f1de830c988b1ed9707036481582540aa97c6ee9e31b0dd1ee2a8346dc3b81197d8c0489563122bba2dd7dffe5fe1
 DIST texlive-module-a2ping-2013.tar.xz 31124 SHA256 a50f2714269e1725a05584d2e1b0b822f082c7291a989d37976b8666f69e8e09 SHA512 bc05c8610e58bacb6001fd41f848d12f8e77837b5e24d32f7af1c9939778d92aeac7ee07969f22e86c72a8850650ad1d06341681503d8d8699dbf6db1de4be62 WHIRLPOOL c4ebb0c3bb4db9d176fbadfd06753509965aa7d1d89be69ded9cc4488b1629fbd7584f2fed70b9633ead1341fb88de006b7f840446f142ec25eaeeb8cd7577d5
 DIST texlive-module-a2ping-2014.tar.xz 31124 SHA256 18c8686e9d443af0e3b6d4feaaa42996b1fa2f03a07dce0e19d10226b7bc8839 SHA512 d5b65f04a96b7206624fd80fae4a04779fd31995247ed4b04d3ddb7197aeb3373d6b3679f674e29fb39e7022f37115fab2a3f5fc7304b3c6c133456242fef8bb WHIRLPOOL a6a8c93836825b07930a61c35d37b657479025d217b4d006021724a1b85c9afa4b6dffa0ba1d96bc0bdcaa3fd72274c11ea401d8387d1bcedbd20df2fde31cbd
diff --git a/app-text/texlive-core/files/texlive-core-2014-format-security.patch b/app-text/texlive-core/files/texlive-core-2014-format-security.patch
new file mode 100644
index 000000000000..1c1c85c78494
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2014-format-security.patch
@@ -0,0 +1,193 @@
+diff -up source/texk/devnag/src/devnag.c.format source/texk/devnag/src/devnag.c
+--- source/texk/devnag/src/devnag.c.format	2013-12-22 17:03:35.000000000 +0100
++++ source/texk/devnag/src/devnag.c	2013-12-26 20:13:56.390766885 +0100
+@@ -2395,7 +2395,7 @@ void put_macro(short macro) {
+ void err_ill(const char *str) {
+    fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
+ 	  str, linenumber);
+-   fprintf(stderr, inbuf);
++   fprintf(stderr, "%s", inbuf);
+    exit(1);
+ }
+ 
+diff -up source/texk/dvidvi/dvidvi.c.format source/texk/dvidvi/dvidvi.c
+--- source/texk/dvidvi/dvidvi.c.format	2013-12-22 17:03:36.000000000 +0100
++++ source/texk/dvidvi/dvidvi.c	2013-12-26 20:13:56.390766885 +0100
+@@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
+  *   Print a usage error messsage, and quit.
+  */
+ static void usage(void) {
+-   (void)fprintf(stderr,banner);
++   (void)fprintf(stderr,"%s",banner);
+    (void)fprintf(stderr,"Usage:  dvidvi [options] input[.dvi] [output]\n");
+    (void)fprintf(stderr,"where options are:\n");
+    (void)fprintf(stderr,"    [-f n] first page printed     [-l n] last page printed\n");
+@@ -806,7 +806,7 @@ default:
+       } /* else argument with '-' */
+    }  /* for */
+    if (*iname == 0) {
+-       (void)fprintf(stderr, banner) ;
++       (void)fprintf(stderr, "%s", banner) ;
+        error("! no input file specified");
+    }
+    /* Inserted by djc@dsmail.hmi.de 3.8.1994 */
+@@ -817,7 +817,7 @@ default:
+    }
+ 
+    if (*oname != 0 && !quiet) {
+-       (void)fprintf(stderr, banner) ;
++       (void)fprintf(stderr, "%s", banner) ;
+        (void)fprintf(stderr, "%s -> %s\n",iname,oname);
+        temp = nextstring ;
+    }
+diff -up source/texk/dvi2tty/dvi2tty-5.3.4/DVI.format source/texk/dvi2tty/dvi2tty-5.3.4/DVI
+diff -up source/texk/ps2pkm/objects.h.format source/texk/ps2pkm/objects.h
+--- source/texk/ps2pkm/objects.h.format	2013-12-22 17:03:29.000000000 +0100
++++ source/texk/ps2pkm/objects.h	2013-12-26 20:13:56.390766885 +0100
+@@ -232,7 +232,7 @@ struct xobject {
+ /*SHARED*/
+ /* NDW: personally, I want to see status and error messages! */
+ #define IfTrace0(condition,model)                                 \
+-        {if (condition) printf(model);}
++        {if (condition) printf("%s",model);}
+ #define IfTrace1(condition,model,arg0)                            \
+         {if (condition) printf(model,arg0);}
+ #define IfTrace2(condition,model,arg0,arg1)                       \
+diff -up source/texk/web2c/cwebboot.cin.format source/texk/web2c/cwebboot.cin
+--- source/texk/web2c/cwebboot.cin.format	2013-12-22 17:03:30.000000000 +0100
++++ source/texk/web2c/cwebboot.cin	2013-12-26 20:13:56.390766885 +0100
+@@ -1090,7 +1090,7 @@ void
+  fatal(const char*s,const char*t)
+ #line 1182 "cwebdir/common.w"
+ {
+-if(*s)printf(s);
++if(*s)printf("%s",s);
+ err_print(t);
+ history= fatal_message;exit(wrap_up());
+ }
+diff -up source/texk/web2c/cwebdir/common.c.format source/texk/web2c/cwebdir/common.c
+--- source/texk/web2c/cwebdir/common.c.format	2013-12-22 17:03:31.000000000 +0100
++++ source/texk/web2c/cwebdir/common.c	2013-12-26 20:13:56.391766888 +0100
+@@ -1063,7 +1063,7 @@ void
+ fatal(s,t)
+ char*s,*t;
+ {
+-if(*s)printf(s);
++if(*s)printf("%s",s);
+ err_print(t);
+ history= fatal_message;exit(wrap_up());
+ }
+diff -up source/texk/web2c/cwebdir/common.w.format source/texk/web2c/cwebdir/common.w
+--- source/texk/web2c/cwebdir/common.w.format	2013-12-22 17:03:31.000000000 +0100
++++ source/texk/web2c/cwebdir/common.w	2013-12-26 20:13:56.391766888 +0100
+@@ -1180,7 +1180,7 @@ concatenated to print the final error me
+ fatal(s,t)
+   char *s,*t;
+ {
+-  if (*s) printf(s);
++  if (*s) printf("%s",s);
+   err_print(t);
+   history=fatal_message; exit(wrap_up());
+ }
+diff -up source/texk/web2c/cwebdir/cweave.w.format source/texk/web2c/cwebdir/cweave.w
+--- source/texk/web2c/cwebdir/cweave.w.format	2013-12-22 17:03:31.000000000 +0100
++++ source/texk/web2c/cwebdir/cweave.w	2013-12-26 20:13:56.392766891 +0100
+@@ -1784,7 +1784,7 @@ void
+ print_cat(c) /* symbolic printout of a category */
+ eight_bits c;
+ {
+-  printf(cat_name[c]);
++  printf("%s",cat_name[c]);
+ }
+ 
+ @ The token lists for translated \TEX/ output contain some special control
+diff -up source/texk/web2c/omegafonts/error_routines.c.format source/texk/web2c/omegafonts/error_routines.c
+--- source/texk/web2c/omegafonts/error_routines.c.format	2013-12-22 17:03:30.000000000 +0100
++++ source/texk/web2c/omegafonts/error_routines.c	2013-12-26 20:13:56.392766891 +0100
+@@ -36,7 +36,7 @@ void
+ lex_error_0(const_string fmt)
+ {
+     fprintf(stderr, "line %d (lexing): ", line_number);
+-    fprintf(stderr, fmt);
++    fprintf(stderr, "%s", fmt);
+     fprintf(stderr, "\n");
+ }
+ 
+@@ -68,7 +68,7 @@ void
+ yyerror(const_string fmt)
+ {
+     fprintf(stderr, "line %d (parsing): ", line_number);
+-    fprintf(stderr, fmt);
++    fprintf(stderr, "%s", fmt);
+     fprintf(stderr, "\n");
+ }
+ 
+@@ -77,7 +77,7 @@ void
+ warning_0(const_string fmt)
+ {
+     fprintf(stderr, "line %d (warning): ", line_number);
+-    fprintf(stderr, fmt);
++    fprintf(stderr, "%s", fmt);
+     fprintf(stderr, "\n");
+ }
+ 
+@@ -125,7 +125,7 @@ void
+ fatal_error_0(const_string fmt)
+ {
+     fprintf(stderr, "line %d (fatal): ", line_number);
+-    fprintf(stderr, fmt);
++    fprintf(stderr, "%s", fmt);
+     fprintf(stderr, "\n");
+     exit(1);
+ }
+@@ -161,7 +161,7 @@ void
+ internal_error_0(const_string fmt)
+ {
+     fprintf(stderr, "line %d (internal): ", line_number);
+-    fprintf(stderr, fmt);
++    fprintf(stderr, "%s", fmt);
+     fprintf(stderr, "\n");
+     exit(2);
+ }
+diff -up source/texk/web2c/omegafonts/out_routines.c.format source/texk/web2c/omegafonts/out_routines.c
+--- source/texk/web2c/omegafonts/out_routines.c.format	2013-12-22 17:03:30.000000000 +0100
++++ source/texk/web2c/omegafonts/out_routines.c	2013-12-26 20:13:56.392766891 +0100
+@@ -383,5 +383,5 @@ out_digits(unsigned counter)
+ void
+ out(const_string sval)
+ {
+-	fprintf(file_output, sval);
++	fprintf(file_output, "%s", sval);
+ }
+diff -up source/texk/web2c/tiedir/tie.c.format source/texk/web2c/tiedir/tie.c
+--- source/texk/web2c/tiedir/tie.c.format	2013-12-22 17:03:31.000000000 +0100
++++ source/texk/web2c/tiedir/tie.c	2013-12-26 20:13:56.392766891 +0100
+@@ -27,14 +27,14 @@
+  \
+ 
+ #define term_out stdout
+-#define print(a)fprintf(term_out,a)
++#define print(a)fprintf(term_out,"%s",a)
+ #define print2(a,b)fprintf(term_out,a,b)
+ #define print3(a,b,c)fprintf(term_out,a,b,c)
+ #define print_c(v)fputc(v,term_out);
+ #define new_line(v)fputc('\n',v)
+ #define term_new_line new_line(term_out) \
+ 
+-#define print_ln(v){fprintf(term_out,v);term_new_line;} \
++#define print_ln(v){fprintf(term_out,"%s",v);term_new_line;} \
+ 
+ #define print2_ln(a,b){print2(a,b);term_new_line;}
+ #define print3_ln(a,b,c){print3(a,b,c);term_new_line;} \
+diff -up source/texk/web2c/tiedir/tie.w.format source/texk/web2c/tiedir/tie.w
+--- source/texk/web2c/tiedir/tie.w.format	2013-12-22 17:03:31.000000000 +0100
++++ source/texk/web2c/tiedir/tie.w	2013-12-26 20:13:56.393766894 +0100
+@@ -465,7 +465,7 @@ for terminating an output line and writi
+ @d new_line(v)  fputc('\n',v) /* start new line */
+ @d term_new_line  new_line(term_out)
+ 	/* start new line of the terminal */
+-@d print_ln(v)  {fprintf(term_out,v);term_new_line;}
++@d print_ln(v)  {fprintf(term_out,"%s",v);term_new_line;}
+ 	/* `|print|' and then start new line */
+ @d print2_ln(a,b)  {print2(a,b);term_new_line;} /* same with two arguments */
+ @d print3_ln(a,b,c)  {print3(a,b,c);term_new_line;}
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index 68edcb81679a..d03aa9f02781 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
-	<maintainer>
-		<email>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<longdescription lang="en">
+  <herd>tex</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <longdescription lang="en">
 		TeXLive core binaries
 	</longdescription>
-	<use>
-	<flag name='xetex'>Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
-	</use>
+  <use>
+    <flag name="xetex">Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
+  </use>
 </pkgmetadata>
-
diff --git a/app-text/texlive-core/texlive-core-2014-r2.ebuild b/app-text/texlive-core/texlive-core-2014-r2.ebuild
index f77b84023451..d27b5227fb5e 100644
--- a/app-text/texlive-core/texlive-core-2014-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2014-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2014-r2.ebuild,v 1.1 2015/02/28 17:45:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2014-r2.ebuild,v 1.2 2015/03/09 12:17:39 jlec Exp $
 
 EAPI=5
 
@@ -236,9 +236,9 @@ src_configure() {
 
 src_compile() {
 	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
 
-	cd "${B}"
+	cd "${B}" || die
 	# Mimic updmap --syncwithtrees to enable only fonts installed
 	# Code copied from updmap script
 	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
@@ -255,9 +255,9 @@ src_compile() {
 
 src_install() {
 	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
 
-	cd "${B}"
+	cd "${B}" || die
 	dodir /usr/share # just in case
 	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
 	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
@@ -268,19 +268,19 @@ src_install() {
 
 	docinto texk
 	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
+	dodoc ChangeLog README
 
 	docinto dviljk
 	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+	dodoc ChangeLog README NEWS
 
 	docinto makeindexk
 	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+	dodoc ChangeLog NOTES README
 
 	docinto web2c
 	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+	dodoc ChangeLog NEWS PROJECTS README
 
 	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
 
diff --git a/app-text/texlive-core/texlive-core-2014-r3.ebuild b/app-text/texlive-core/texlive-core-2014-r3.ebuild
new file mode 100644
index 000000000000..a5f02e71c90f
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2014-r3.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2014-r3.ebuild,v 1.1 2015/03/09 14:27:47 jlec Exp $
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="46"
+TL_SOURCE_VERSION=20140525
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXaw
+				x11-libs/libXfont
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		app-text/teckit
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.0
+	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20130530
+	>=app-text/dvipsk-5.993_p20130530
+	>=dev-tex/bibtexu-3.71_p20130530
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/perl-tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	epatch "${FILESDIR}"/${P}-format-security.patch
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
index 1dc181194992..590efa820834 100644
--- a/app-text/unrtf/unrtf-0.21.9.ebuild
+++ b/app-text/unrtf/unrtf-0.21.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/unrtf-0.21.9.ebuild,v 1.1 2015/01/03 14:34:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/unrtf-0.21.9.ebuild,v 1.2 2015/03/09 11:18:46 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-vim/scala-syntax/Manifest b/app-vim/scala-syntax/Manifest
new file mode 100644
index 000000000000..6ec4e1bf0310
--- /dev/null
+++ b/app-vim/scala-syntax/Manifest
@@ -0,0 +1 @@
+DIST scala-syntax-1.0.tar.gz 3622 SHA256 5df41b4183b1b4eb021e914d762a4d7156a8491df28c106f5cbdafaed1391a46 SHA512 b9d4b5f5b0077fdf1c4cfa4ea88e7262c45119d53451bd744490c79a0f5c2890d0f13f0bf58598114899ce6e0cb918fa2933f0194e1e60d9283749ad584347b2 WHIRLPOOL d49421810a2fbccc2cd3fd7de6247c7f482813f8415010005ce75d7cf03b74686bec169c5d94e4dc754c02bac041304c3a7b935e53387a1ef8e63a0de31ecd08
diff --git a/media-libs/sdl-flic/metadata.xml b/app-vim/scala-syntax/metadata.xml
similarity index 67%
rename from media-libs/sdl-flic/metadata.xml
rename to app-vim/scala-syntax/metadata.xml
index d3c2cc926f0b..8653502db3ff 100644
--- a/media-libs/sdl-flic/metadata.xml
+++ b/app-vim/scala-syntax/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-vim/scala-syntax/scala-syntax-1.0.ebuild b/app-vim/scala-syntax/scala-syntax-1.0.ebuild
new file mode 100644
index 000000000000..d57557b7a35b
--- /dev/null
+++ b/app-vim/scala-syntax/scala-syntax-1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/scala-syntax/scala-syntax-1.0.ebuild,v 1.1 2015/03/09 17:37:23 monsieurp Exp $
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Scala syntax highlighting, filetype and indent settings"
+HOMEPAGE="http://www.scala-lang.org/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-games/cegui/cegui-0.8.4.ebuild b/dev-games/cegui/cegui-0.8.4.ebuild
index 3100e1dc9d14..fd3503e7b9d2 100644
--- a/dev-games/cegui/cegui-0.8.4.ebuild
+++ b/dev-games/cegui/cegui-0.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.8.4.ebuild,v 1.1 2014/09/07 07:15:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.8.4.ebuild,v 1.2 2015/03/09 18:37:20 mr_bones_ Exp $
 
 EAPI=5
 
 # TODO: multiple ABI?
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
 inherit eutils flag-o-matic cmake-utils python-single-r1
 
 DESCRIPTION="Crazy Eddie's GUI System"
diff --git a/dev-lang/inform/inform-6.33.1_p2.ebuild b/dev-lang/inform/inform-6.33.1_p2.ebuild
index d1ea6c1a06f0..866f3f1eb9ea 100644
--- a/dev-lang/inform/inform-6.33.1_p2.ebuild
+++ b/dev-lang/inform/inform-6.33.1_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/inform-6.33.1_p2.ebuild,v 1.1 2014/12/12 03:30:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/inform-6.33.1_p2.ebuild,v 1.2 2015/03/09 11:45:46 ago Exp $
 
 EAPI=5
 MY_P=${P/_p/-b}
@@ -10,7 +10,7 @@ SRC_URI="http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source
 
 LICENSE="Artistic-2 Inform"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="emacs"
 PDEPEND="emacs? ( app-emacs/inform-mode )"
 
diff --git a/dev-lang/pcc/files/pcc-1.1.0-multiarch.patch b/dev-lang/pcc/files/pcc-1.1.0-multiarch.patch
new file mode 100644
index 000000000000..8420908e9f9d
--- /dev/null
+++ b/dev-lang/pcc/files/pcc-1.1.0-multiarch.patch
@@ -0,0 +1,11 @@
+--- cc/cc/cc.c	2014-12-06 09:52:55.000000000 +0000
++++ cc/cc/cc.c.new	2015-03-09 09:22:25.569376330 +0000
+@@ -206,7 +206,7 @@
+ #define PCCLIBDIR	NULL
+ #endif
+ #ifndef DEFLIBDIRS	/* default library search paths */
+-#ifdef MULTIARCH_PATH
++#ifndef MULTIARCH_PATH
+ #define DEFLIBDIRS	{ "/usr/lib/", 0 }
+ #else
+ #define DEFLIBDIRS	{ "/usr/lib/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
diff --git a/dev-lang/pcc/pcc-1.1.0.ebuild b/dev-lang/pcc/pcc-1.1.0-r1.ebuild
similarity index 79%
rename from dev-lang/pcc/pcc-1.1.0.ebuild
rename to dev-lang/pcc/pcc-1.1.0-r1.ebuild
index f82da1266500..9a155c8bc3df 100644
--- a/dev-lang/pcc/pcc-1.1.0.ebuild
+++ b/dev-lang/pcc/pcc-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pcc/pcc-1.1.0.ebuild,v 1.1 2014/12/29 02:53:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pcc/pcc-1.1.0-r1.ebuild,v 1.2 2015/03/09 09:29:02 patrick Exp $
 
 EAPI=5
 
@@ -17,12 +17,12 @@ KEYWORDS="~x86 ~amd64 ~amd64-fbsd"
 IUSE=""
 DEPEND=">=dev-libs/pcc-libs-${PV}"
 RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}-${PVR/*_pre/}/
 
 src_prepare() {
 	sed -i -e 's/AC_CHECK_PROG(strip,strip,yes,no)//' configure.ac || die "Failed to fix configure.ac"
 	sed -i -e 's/AC_SUBST(strip)//' configure.ac || die "Failed to fix configure.ac more"
 	eautoreconf
+	epatch "${FILESDIR}/${P}-multiarch.patch" || die
 }
 
 src_configure() {
diff --git a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild b/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
index 8c816381e902..f9af8309d735 100644
--- a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.2.ebuild,v 1.5 2015/03/06 22:44:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.2.ebuild,v 1.6 2015/03/09 00:03:28 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="hdf5 +lz4 +snappy static-libs test zlib"
 
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
index c5bddb5a12cc..9fd0367dac32 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.0.0a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-6.0.0a.ebuild,v 1.2 2014/05/08 20:01:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-6.0.0a.ebuild,v 1.3 2015/03/09 17:53:52 blueness Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
 	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
 
-LICENSE="LGPL-3"
+LICENSE="|| ( LGPL-3+ GPL-2+ )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc cxx pgo static-libs"
diff --git a/dev-libs/libisoburn/libisoburn-1.3.8.ebuild b/dev-libs/libisoburn/libisoburn-1.3.8.ebuild
index 546989e42770..b71c020cddc4 100644
--- a/dev-libs/libisoburn/libisoburn-1.3.8.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.3.8.ebuild,v 1.6 2015/02/24 09:17:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.3.8.ebuild,v 1.7 2015/03/09 10:05:07 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
 IUSE="acl cdio debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 81a083f425fb..41c185075d70 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,2 +1,3 @@
 DIST quazip-0.5.1.tar.gz 354658 SHA256 078176a72288983f78b45c15f7d245131d9d5fc36a22f2757d75a78658c33268 SHA512 b4b5fe48f4d30fe0f9d2606c691337526ced169806e4267368dedaee543e12826dc2799c451851c0465f86fbf27d663f94e3b15b27744eac6104f9f4667de640 WHIRLPOOL ffb3cdc76e959fc8bee7cec3952b90f3e97fd7aad5602b6a2f3bb5d5e1c944e228dac43cca430282f61210e65d6f1afd993dbe29ee9539f33562b3ca23edf31c
 DIST quazip-0.6.2.tar.gz 423027 SHA256 adf4047213662a0362090edaaee4283216df2034ab5923697f9aa81d081c0b43 SHA512 32eb0b8faadb5f08086874c8ac33e3ea794a8a2e9c2904d0965cb5b15aec6280080aa19a032a19701e367873e8c3b613834823bb077b8fd254c5db4939917e49 WHIRLPOOL dc4fcab4b062631960236ef7cd9c0f43e5d419e34c3880b3caf02965f8a8302d622a1dc25f081cc2bcc5d3db96494b3d178a8f1d4b678cb452503af23e14e193
+DIST quazip-0.7.1.tar.gz 390629 SHA256 78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de SHA512 58e044019505075aa89f112672c04c54875d98b353ac5a39b6eb3e1f08ea27bd9900126d902c282b87910e4bae5ab9da79942b9add7a5535625c187331445acc WHIRLPOOL bf683e90fd58ae4d94d72f4b4530754eb1944df03adccd4e0302fe7ec82afe07fd54c9d6975ba4f1b30e3d14928fbcc6c987ec612deeb6b66be9c86c5e5d9787
diff --git a/dev-libs/quazip/quazip-0.7.1.ebuild b/dev-libs/quazip/quazip-0.7.1.ebuild
new file mode 100644
index 000000000000..2fb1e6423040
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.7.1.ebuild,v 1.1 2015/03/09 15:26:18 jlec Exp $
+
+EAPI=5
+
+inherit multilib qmake-utils
+
+DESCRIPTION="A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="http://quazip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	sys-libs/zlib[minizip]
+	qt4? ( dev-qt/qtcore:4 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		)
+	"
+DEPEND="${RDEPEND}
+	test? (
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+		)"
+
+S="${WORKDIR}"/${P}
+
+DOCS="NEWS.txt README.txt"
+HTML_DOCS=( doc/html/. )
+
+MULTIBUILD_VARIANTS=( qt4 qt5 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.1-prll.patch
+)
+
+src_prepare() {
+	sed \
+		-e "s:\/lib/:\/$(get_libdir)\/:g" \
+		-i ${PN}/${PN}.pro || die
+
+	echo "PREFIX=${EPREFIX}/usr" >> ${PN}/${PN}.pri || die
+
+	use test || sed -e 's:qztest::g' -i ${PN}.pro || die
+}
+
+src_configure() {
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_test() {
+	cd qztest || die
+	LD_LIBRARY_PATH="${BUILD_DIR}"/${PN} ./qztest || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+	einstalldocs
+	insinto /usr/share/cmake/Modules
+	doins FindQuaZip.cmake
+}
diff --git a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild
index 44bb55ecbdc5..c357239efc6c 100644
--- a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild
+++ b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild,v 1.8 2014/01/02 12:53:14 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild,v 1.9 2015/03/09 16:49:52 dilfridge Exp $
 
 EAPI=5
 
@@ -14,7 +14,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-DEPEND="virtual/perl-Module-Build"
+DEPEND="
+	virtual/perl-Module-Build
+	virtual/perl-CPAN-Meta
+	>=virtual/perl-Parse-CPAN-Meta-1.441.400
+"
+# see bug 542584 for Parse::CPAN::Meta
 
 SRC_TEST="do"
 PREFER_BUILDPL="no"
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild
new file mode 100644
index 000000000000..8fec70bb6c51
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBD-mysql/DBD-mysql-4.31.0.ebuild,v 1.1 2015/03/09 14:56:36 monsieurp Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=CAPTTOFU
+MODULE_VERSION=4.031
+inherit eutils perl-module
+
+DESCRIPTION="The Perl DBD:mysql Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="embedded test"
+
+RDEPEND="dev-perl/DBI
+	dev-perl/Test-Deep
+	virtual/mysql[embedded?]"
+DEPEND="${RDEPEND}"
+
+if use test; then
+	SRC_TEST="do"
+else
+	SRC_TEST="skip"
+fi
+
+src_configure() {
+	if use test; then
+		myconf="${myconf} --testdb=test \
+			--testhost=localhost \
+			--testuser=test \
+			--testpassword=test"
+	fi
+	use embedded && myconf="${myconf} --force-embedded --embedded=mysql_config"
+	perl-module_src_configure
+}
+
+src_test() {
+	if use test; then
+		einfo
+		einfo "If tests fail, you have to configure your MySQL instance to create"
+		einfo "and grant some privileges to the test user."
+		einfo "You can run the following commands at the MySQL prompt: "
+		einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+		einfo "> CREATE DATABASE test;"
+		einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+		einfo
+		sleep 5
+		perl-module_src_test
+	fi
+}
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 998bf68b31a3..01ed5ce02d00 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1 +1,2 @@
 DIST DBD-mysql-4.020.tar.gz 137736 SHA256 9299f39f3903d3e0afa6440401f88329a057834817684aa699a507dad6a993e7 SHA512 4f1b788ec7490e585b5d31e719dfa1418fee210705781e05f19fee5da386fc87d7c56a348e508448f6d83148367fbc41e1f4673f2ccb52f16a62938b40c1d600 WHIRLPOOL 65bf1f3abec057cf77cb2a96195d0193bfdc1f7b7fde7914dc141fc897f0a1a16931fb0b30a644604f5fe409deeee4d552ba88e22282c83f10a9fc99210d672f
+DIST DBD-mysql-4.031.tar.gz 145217 SHA256 ae2ee4339fb13429922d76d37e25ce838f98baa011f691a6bbec8513ddb4cfd2 SHA512 b7cdd80e340ecd5d2d9ab59fde73824dc1334afc9ccc3e851e1c5bbf39b95f2a82181d0a78785b8c9543bf4ae6d3115809da186a7778320adeaecdf318876f95 WHIRLPOOL f10f002796c723a4095055e8bbbcb3a585c59f6d2ca1b2937d3a1d5b24d91221ad6d474b403d26fffc34059e13097194933dfca8771a46ce0668485aafc6b782
diff --git a/dev-perl/Filter/Filter-1.490.0.ebuild b/dev-perl/Filter/Filter-1.490.0.ebuild
index 4d88d71f82d2..81f60cbc39e1 100644
--- a/dev-perl/Filter/Filter-1.490.0.ebuild
+++ b/dev-perl/Filter/Filter-1.490.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Filter/Filter-1.490.0.ebuild,v 1.7 2015/02/28 18:24:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Filter/Filter-1.490.0.ebuild,v 1.8 2015/03/09 12:16:00 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
index ca2222ec84b3..2098cdd959d4 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild,v 1.1 2014/08/22 20:18:34 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild,v 1.2 2015/03/09 12:04:59 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Retrieve names of code references"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
index d031c1b0c827..b3c13babe321 100644
--- a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
+++ b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Base/Test-Base-0.880.0.ebuild,v 1.2 2015/02/28 18:33:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Base/Test-Base-0.880.0.ebuild,v 1.3 2015/03/09 12:17:31 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Data Driven Testing Framework"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Text-Diff/Text-Diff-1.410.0-r1.ebuild b/dev-perl/Text-Diff/Text-Diff-1.410.0-r1.ebuild
index 1befe2473807..da199159f09a 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.410.0-r1.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.410.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Diff/Text-Diff-1.410.0-r1.ebuild,v 1.1 2014/08/22 20:47:24 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Diff/Text-Diff-1.410.0-r1.ebuild,v 1.2 2015/03/09 12:12:41 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Easily create test classes in an xUnit style"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/Algorithm-Diff"
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.240.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.240.0.ebuild
index d341daa20d5c..8e29b1d77fa7 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.240.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.240.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/namespace-autoclean/namespace-autoclean-0.240.0.ebuild,v 1.2 2015/02/22 10:58:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/namespace-autoclean/namespace-autoclean-0.240.0.ebuild,v 1.3 2015/03/09 12:05:59 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Keep imports out of your namespace"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/3to2/3to2-1.0.ebuild b/dev-python/3to2/3to2-1.0.ebuild
index 8d52827e800c..d7b58676f99e 100644
--- a/dev-python/3to2/3to2-1.0.ebuild
+++ b/dev-python/3to2/3to2-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/3to2/3to2-1.0.ebuild,v 1.7 2015/03/06 22:04:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/3to2/3to2-1.0.ebuild,v 1.8 2015/03/08 23:37:54 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/BitVector/BitVector-3.3.2.ebuild b/dev-python/BitVector/BitVector-3.3.2.ebuild
index 7f2d5d76e4d7..d9548c830ad9 100644
--- a/dev-python/BitVector/BitVector-3.3.2.ebuild
+++ b/dev-python/BitVector/BitVector-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/BitVector/BitVector-3.3.2.ebuild,v 1.3 2015/03/06 22:04:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/BitVector/BitVector-3.3.2.ebuild,v 1.4 2015/03/08 23:37:58 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="http://cobweb.ecn.purdue.edu/~kak/dist/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 python_test() {
 	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/Coffin/Coffin-0.3.8.ebuild b/dev-python/Coffin/Coffin-0.3.8.ebuild
index d5508b789241..93767f2d0932 100644
--- a/dev-python/Coffin/Coffin-0.3.8.ebuild
+++ b/dev-python/Coffin/Coffin-0.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Coffin/Coffin-0.3.8.ebuild,v 1.2 2015/03/06 22:04:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Coffin/Coffin-0.3.8.ebuild,v 1.3 2015/03/08 23:38:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild b/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild
index 6aaed8aadf4f..e3f3c39b27d1 100644
--- a/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild
+++ b/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild,v 1.2 2015/03/06 22:05:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild,v 1.3 2015/03/08 23:38:06 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://openfoamwiki.net/images/a/ae/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="extras"
 
 DEPEND="sci-visualization/gnuplot
diff --git a/dev-python/PyGithub/PyGithub-1.25.2.ebuild b/dev-python/PyGithub/PyGithub-1.25.2.ebuild
index d9db50f61585..df617dc067e0 100644
--- a/dev-python/PyGithub/PyGithub-1.25.2.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.25.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.25.2.ebuild,v 1.2 2015/03/06 22:05:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.25.2.ebuild,v 1.3 2015/03/08 23:38:11 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/PyPDF2/PyPDF2-1.24.ebuild b/dev-python/PyPDF2/PyPDF2-1.24.ebuild
index bbde83dacdb1..928f542b49f5 100644
--- a/dev-python/PyPDF2/PyPDF2-1.24.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyPDF2/PyPDF2-1.24.ebuild,v 1.2 2015/03/06 22:05:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyPDF2/PyPDF2-1.24.ebuild,v 1.3 2015/03/08 23:38:15 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 python_install_all() {
diff --git a/dev-python/SaltTesting/SaltTesting-2014.8.5.ebuild b/dev-python/SaltTesting/SaltTesting-2014.8.5.ebuild
index 0c6194b64393..997c9a9a1397 100644
--- a/dev-python/SaltTesting/SaltTesting-2014.8.5.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2014.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/SaltTesting/SaltTesting-2014.8.5.ebuild,v 1.2 2015/03/06 22:05:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/SaltTesting/SaltTesting-2014.8.5.ebuild,v 1.3 2015/03/08 23:38:19 pacho Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/addons/addons-0.7.ebuild b/dev-python/addons/addons-0.7.ebuild
index 7d1c6f19773c..11170806d010 100644
--- a/dev-python/addons/addons-0.7.ebuild
+++ b/dev-python/addons/addons-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/addons/addons-0.7.ebuild,v 1.4 2015/03/06 22:05:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/addons/addons-0.7.ebuild,v 1.5 2015/03/08 23:38:23 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ DESCRIPTION="Dynamically extend other objects (formerly ObjectRoles)"
 HOMEPAGE="http://pypi.python.org/pypi/AddOns/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/adns-python/adns-python-1.2.1-r1.ebuild b/dev-python/adns-python/adns-python-1.2.1-r1.ebuild
index 3b7f6377188b..d30cb0cb767b 100644
--- a/dev-python/adns-python/adns-python-1.2.1-r1.ebuild
+++ b/dev-python/adns-python/adns-python-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/adns-python/adns-python-1.2.1-r1.ebuild,v 1.6 2015/03/07 08:14:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adns-python/adns-python-1.2.1-r1.ebuild,v 1.7 2015/03/08 23:38:28 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://adns-python.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=">=net-libs/adns-1.3"
diff --git a/dev-python/adodb-py/adodb-py-2.20-r1.ebuild b/dev-python/adodb-py/adodb-py-2.20-r1.ebuild
index 0ca687140584..1768d613ffd8 100644
--- a/dev-python/adodb-py/adodb-py-2.20-r1.ebuild
+++ b/dev-python/adodb-py/adodb-py-2.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-2.20-r1.ebuild,v 1.6 2015/03/07 08:14:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-2.20-r1.ebuild,v 1.7 2015/03/08 23:38:32 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/adodb/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 IUSE="mysql postgres sqlite"
 
 RDEPEND="postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] )
diff --git a/dev-python/alembic/alembic-0.7.4.ebuild b/dev-python/alembic/alembic-0.7.4.ebuild
index 7c978c1592ce..5efc32fa0008 100644
--- a/dev-python/alembic/alembic-0.7.4.ebuild
+++ b/dev-python/alembic/alembic-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/alembic-0.7.4.ebuild,v 1.2 2015/03/06 22:06:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/alembic-0.7.4.ebuild,v 1.3 2015/03/08 23:38:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test doc"
 
 # requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
diff --git a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
index 7a32478a0cda..6f311f3d3735 100644
--- a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
+++ b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild,v 1.6 2015/03/06 22:06:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild,v 1.7 2015/03/08 23:38:40 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="http://py-amqplib.googlecode.com/files/${P}.tgz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples extras test"
 
 PATCHES=(
diff --git a/dev-python/aniso8601/aniso8601-0.83.ebuild b/dev-python/aniso8601/aniso8601-0.83.ebuild
index c6178fa3d96f..f2c0ff8670b6 100644
--- a/dev-python/aniso8601/aniso8601-0.83.ebuild
+++ b/dev-python/aniso8601/aniso8601-0.83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aniso8601/aniso8601-0.83.ebuild,v 1.2 2015/03/06 22:06:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aniso8601/aniso8601-0.83.ebuild,v 1.3 2015/03/08 23:38:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ansi2html/ansi2html-1.0.7.ebuild b/dev-python/ansi2html/ansi2html-1.0.7.ebuild
index fae853c77b37..b6600f50bbb8 100644
--- a/dev-python/ansi2html/ansi2html-1.0.7.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.0.7.ebuild,v 1.2 2015/03/06 22:06:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.0.7.ebuild,v 1.3 2015/03/08 23:38:48 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansicolor/ansicolor-0.2.4.ebuild b/dev-python/ansicolor/ansicolor-0.2.4.ebuild
index 3a483864aba5..71ed2c7dad55 100644
--- a/dev-python/ansicolor/ansicolor-0.2.4.ebuild
+++ b/dev-python/ansicolor/ansicolor-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansicolor/ansicolor-0.2.4.ebuild,v 1.2 2015/03/06 22:06:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansicolor/ansicolor-0.2.4.ebuild,v 1.3 2015/03/08 23:38:52 pacho Exp $
 
 EAPI=5
 
@@ -16,5 +16,5 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
index 91a434390011..340aeef504db 100644
--- a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
+++ b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/anyjson/anyjson-0.3.3-r1.ebuild,v 1.7 2015/03/06 22:06:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/anyjson/anyjson-0.3.3-r1.ebuild,v 1.8 2015/03/08 23:38:56 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # please keep all supported implementations in 'test?'
diff --git a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
index 219886fd24c6..bfaa115cf083 100644
--- a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
+++ b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild,v 1.2 2015/03/06 22:06:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild,v 1.3 2015/03/08 23:39:00 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bazaar doc git mercurial subversion"
 
 RDEPEND="dev-python/apipkg[${PYTHON_USEDEP}]
diff --git a/dev-python/apipkg/apipkg-1.2-r1.ebuild b/dev-python/apipkg/apipkg-1.2-r1.ebuild
index 1496b5df6924..ea89c6a78105 100644
--- a/dev-python/apipkg/apipkg-1.2-r1.ebuild
+++ b/dev-python/apipkg/apipkg-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.2-r1.ebuild,v 1.6 2015/03/06 22:07:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.2-r1.ebuild,v 1.7 2015/03/08 23:39:05 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/appdirs/appdirs-1.4.0.ebuild b/dev-python/appdirs/appdirs-1.4.0.ebuild
index 9cd6fd65c1b4..f0b3216994c3 100644
--- a/dev-python/appdirs/appdirs-1.4.0.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/appdirs/appdirs-1.4.0.ebuild,v 1.3 2015/03/06 22:07:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/appdirs/appdirs-1.4.0.ebuild,v 1.4 2015/03/08 23:39:09 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/apptools/apptools-4.2.1.ebuild b/dev-python/apptools/apptools-4.2.1.ebuild
index d9f378f49b08..6ac6138b95cb 100644
--- a/dev-python/apptools/apptools-4.2.1.ebuild
+++ b/dev-python/apptools/apptools-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-4.2.1.ebuild,v 1.3 2015/03/06 22:07:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-4.2.1.ebuild,v 1.4 2015/03/08 23:39:13 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]
diff --git a/dev-python/apse/apse-0.2-r3.ebuild b/dev-python/apse/apse-0.2-r3.ebuild
index c9db68036dfb..85d737eba7d8 100644
--- a/dev-python/apse/apse-0.2-r3.ebuild
+++ b/dev-python/apse/apse-0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/apse-0.2-r3.ebuild,v 1.7 2015/03/07 08:14:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/apse-0.2-r3.ebuild,v 1.8 2015/03/08 23:39:18 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -15,7 +15,7 @@ SRC_URI="http://www.personal.psu.edu/staff/i/u/iua1/python/${PN}/dist/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/aquarium/aquarium-2.3-r1.ebuild b/dev-python/aquarium/aquarium-2.3-r1.ebuild
index bbd3b8b25cad..9b4338479794 100644
--- a/dev-python/aquarium/aquarium-2.3-r1.ebuild
+++ b/dev-python/aquarium/aquarium-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aquarium/aquarium-2.3-r1.ebuild,v 1.2 2015/03/06 22:07:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aquarium/aquarium-2.3-r1.ebuild,v 1.3 2015/03/08 23:39:22 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aquarium/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/cheetah[${PYTHON_USEDEP}]"
diff --git a/dev-python/argcomplete/argcomplete-0.8.1.ebuild b/dev-python/argcomplete/argcomplete-0.8.1.ebuild
index c37fccc7a1a0..a2fff938bfc6 100644
--- a/dev-python/argcomplete/argcomplete-0.8.1.ebuild
+++ b/dev-python/argcomplete/argcomplete-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argcomplete/argcomplete-0.8.1.ebuild,v 1.3 2015/03/06 22:07:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argcomplete/argcomplete-0.8.1.ebuild,v 1.4 2015/03/08 23:39:26 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/assets/assets-0.1.1-r1.ebuild b/dev-python/assets/assets-0.1.1-r1.ebuild
index b2a233d2a74f..7ce2d5e83254 100644
--- a/dev-python/assets/assets-0.1.1-r1.ebuild
+++ b/dev-python/assets/assets-0.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/assets/assets-0.1.1-r1.ebuild,v 1.3 2015/03/06 22:08:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/assets/assets-0.1.1-r1.ebuild,v 1.4 2015/03/08 23:39:30 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/web-assets/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/astor/astor-0.4.ebuild b/dev-python/astor/astor-0.4.ebuild
index 2aaa869bb454..2efab525f401 100644
--- a/dev-python/astor/astor-0.4.ebuild
+++ b/dev-python/astor/astor-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astor/astor-0.4.ebuild,v 1.2 2015/03/06 22:08:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astor/astor-0.4.ebuild,v 1.3 2015/03/08 23:39:34 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ HOMEPAGE="http://pypi.python.org/pypi/astor"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/astroid/astroid-1.3.4.ebuild b/dev-python/astroid/astroid-1.3.4.ebuild
index c4e712c9fa5d..5b26fa166820 100644
--- a/dev-python/astroid/astroid-1.3.4.ebuild
+++ b/dev-python/astroid/astroid-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astroid/astroid-1.3.4.ebuild,v 1.4 2015/03/07 08:14:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astroid/astroid-1.3.4.ebuild,v 1.5 2015/03/08 23:39:38 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
 IUSE="test"
 
 # Version specified in __pkginfo__.py.
diff --git a/dev-python/async/async-0.6.2.ebuild b/dev-python/async/async-0.6.2.ebuild
index 1a0dd61892e9..17cc9b711e1d 100644
--- a/dev-python/async/async-0.6.2.ebuild
+++ b/dev-python/async/async-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/async/async-0.6.2.ebuild,v 1.2 2015/03/06 22:08:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/async/async-0.6.2.ebuild,v 1.3 2015/03/08 23:39:43 pacho Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-python/atom/atom-0.3.10.ebuild b/dev-python/atom/atom-0.3.10.ebuild
index 68ba78656b08..14ed9bb587ac 100644
--- a/dev-python/atom/atom-0.3.10.ebuild
+++ b/dev-python/atom/atom-0.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/atom/atom-0.3.10.ebuild,v 1.2 2015/03/06 22:08:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/atom/atom-0.3.10.ebuild,v 1.3 2015/03/08 23:39:47 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 RDEPEND=""
diff --git a/dev-python/autobahn/autobahn-0.9.4.2.ebuild b/dev-python/autobahn/autobahn-0.9.4.2.ebuild
index 11a28b575137..07ecf638e31e 100644
--- a/dev-python/autobahn/autobahn-0.9.4.2.ebuild
+++ b/dev-python/autobahn/autobahn-0.9.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/autobahn/autobahn-0.9.4.2.ebuild,v 1.3 2015/03/06 22:08:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autobahn/autobahn-0.9.4.2.ebuild,v 1.4 2015/03/08 23:39:51 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/autopep8/autopep8-1.0.4.ebuild b/dev-python/autopep8/autopep8-1.0.4.ebuild
index 0e0b4f425866..79681ebade0a 100644
--- a/dev-python/autopep8/autopep8-1.0.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-1.0.4.ebuild,v 1.3 2014/12/27 19:36:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-1.0.4.ebuild,v 1.4 2015/03/08 23:39:55 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
diff --git a/dev-python/axiom/axiom-0.7.2.ebuild b/dev-python/axiom/axiom-0.7.2.ebuild
index bf8f104757c9..eec67514c6d6 100644
--- a/dev-python/axiom/axiom-0.7.2.ebuild
+++ b/dev-python/axiom/axiom-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/axiom-0.7.2.ebuild,v 1.4 2015/03/07 08:14:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/axiom-0.7.2.ebuild,v 1.5 2015/03/08 23:40:00 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/epsilon-0.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.3.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.3.ebuild
index f44f3033e9b0..caf6a1cd12ef 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.3.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-lzma/backports-lzma-0.0.3.ebuild,v 1.3 2015/03/06 22:08:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-lzma/backports-lzma-0.0.3.ebuild,v 1.4 2015/03/08 23:40:04 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_4} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/xz-utils
 	dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild
index 838c60c37375..5a15ee24f2bf 100644
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.7-r1.ebuild,v 1.3 2015/03/06 22:08:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.7-r1.ebuild,v 1.4 2015/03/08 23:40:08 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
 
 IUSE="examples test"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
diff --git a/dev-python/billiard/billiard-3.3.0.19.ebuild b/dev-python/billiard/billiard-3.3.0.19.ebuild
index 53880510c29c..5b30f25750b9 100644
--- a/dev-python/billiard/billiard-3.3.0.19.ebuild
+++ b/dev-python/billiard/billiard-3.3.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-3.3.0.19.ebuild,v 1.2 2015/03/06 22:09:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-3.3.0.19.ebuild,v 1.3 2015/03/08 23:40:13 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/biplist/biplist-0.8.ebuild b/dev-python/biplist/biplist-0.8.ebuild
index cdc564bb38c8..a3ceba1b7f1f 100644
--- a/dev-python/biplist/biplist-0.8.ebuild
+++ b/dev-python/biplist/biplist-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/biplist/biplist-0.8.ebuild,v 1.2 2015/03/06 22:09:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/biplist/biplist-0.8.ebuild,v 1.3 2015/03/08 23:40:18 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A binary plist parser/generator for Python"
 HOMEPAGE="http://pypi.python.org/pypi/biplist/ https://github.com/wooster/biplist"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 LICENSE="BSD"
diff --git a/dev-python/bitarray/bitarray-0.8.1.ebuild b/dev-python/bitarray/bitarray-0.8.1.ebuild
index afa5fc12d4fd..4f676efe7ef3 100644
--- a/dev-python/bitarray/bitarray-0.8.1.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitarray/bitarray-0.8.1.ebuild,v 1.3 2015/03/06 22:09:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitarray/bitarray-0.8.1.ebuild,v 1.4 2015/03/08 23:40:22 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_{6,7},3_{2,3,4}})
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${PYTHON}" ${PN}/test_${PN}.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitstring/bitstring-3.1.1.ebuild b/dev-python/bitstring/bitstring-3.1.1.ebuild
index ac4aee317447..c7e0e80934d0 100644
--- a/dev-python/bitstring/bitstring-3.1.1.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.7 2015/03/06 22:09:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.8 2015/03/08 23:40:26 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -12,7 +12,7 @@ SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/dev-python/bjoern/bjoern-1.3.2.ebuild b/dev-python/bjoern/bjoern-1.3.2.ebuild
index 34558904e98d..7c8fc4ca3168 100644
--- a/dev-python/bjoern/bjoern-1.3.2.ebuild
+++ b/dev-python/bjoern/bjoern-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bjoern/bjoern-1.3.2.ebuild,v 1.3 2015/03/06 22:09:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bjoern/bjoern-1.3.2.ebuild,v 1.4 2015/03/08 23:40:30 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libev
diff --git a/dev-python/blaze/blaze-0.7.1.ebuild b/dev-python/blaze/blaze-0.7.1.ebuild
index 023ae04f1066..d899d9451b74 100644
--- a/dev-python/blaze/blaze-0.7.1.ebuild
+++ b/dev-python/blaze/blaze-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/blaze/blaze-0.7.1.ebuild,v 1.2 2015/03/06 22:09:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blaze/blaze-0.7.1.ebuild,v 1.3 2015/03/08 23:40:35 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 # Currently doc build fails, reason unclear but appears it's tied to use of
 # redhat's anaconda installer, seemingly hostile to gentoo.
diff --git a/dev-python/bleach/bleach-1.4.1.ebuild b/dev-python/bleach/bleach-1.4.1.ebuild
index 0139cd39e789..28d157ab7d9b 100644
--- a/dev-python/bleach/bleach-1.4.1.ebuild
+++ b/dev-python/bleach/bleach-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bleach/bleach-1.4.1.ebuild,v 1.2 2015/03/06 22:09:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bleach/bleach-1.4.1.ebuild,v 1.3 2015/03/08 23:40:39 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
index 506d8ea2c34d..7b53744ae3f9 100644
--- a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
+++ b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild,v 1.3 2015/03/06 22:10:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild,v 1.4 2015/03/08 23:40:43 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT=test
 
diff --git a/dev-python/blz/blz-0.6.2.ebuild b/dev-python/blz/blz-0.6.2.ebuild
index c00e919e7ea9..594d73d86aca 100644
--- a/dev-python/blz/blz-0.6.2.ebuild
+++ b/dev-python/blz/blz-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/blz/blz-0.6.2.ebuild,v 1.2 2015/03/06 22:10:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blz/blz-0.6.2.ebuild,v 1.3 2015/03/08 23:40:47 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # dev-libs/c-blosc-1.3.5 shatters the testsuite
diff --git a/dev-python/bokeh/bokeh-0.7.1.ebuild b/dev-python/bokeh/bokeh-0.7.1.ebuild
index bef21c97e750..1d5ff20c78b5 100644
--- a/dev-python/bokeh/bokeh-0.7.1.ebuild
+++ b/dev-python/bokeh/bokeh-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.7.1.ebuild,v 1.2 2015/03/06 22:44:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.7.1.ebuild,v 1.3 2015/03/09 00:03:17 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 # A doc build requires napoleon sphinx extension which will be included in sphinx release 1.3
diff --git a/dev-python/bpython/bpython-0.13.2.ebuild b/dev-python/bpython/bpython-0.13.2.ebuild
index 249b0a5d1583..bb7228819029 100644
--- a/dev-python/bpython/bpython-0.13.2.ebuild
+++ b/dev-python/bpython/bpython-0.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.13.2.ebuild,v 1.2 2015/03/06 22:10:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.13.2.ebuild,v 1.3 2015/03/08 23:40:56 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -14,7 +14,7 @@ SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gtk test"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/buildutils/buildutils-0.3-r1.ebuild b/dev-python/buildutils/buildutils-0.3-r1.ebuild
index 4c32ef551006..15b884d6077d 100644
--- a/dev-python/buildutils/buildutils-0.3-r1.ebuild
+++ b/dev-python/buildutils/buildutils-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/buildutils/buildutils-0.3-r1.ebuild,v 1.5 2015/03/06 22:10:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/buildutils/buildutils-0.3-r1.ebuild,v 1.6 2015/03/08 23:41:01 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/buzhug/buzhug-1.8-r1.ebuild b/dev-python/buzhug/buzhug-1.8-r1.ebuild
index ae9fac3b3a46..3b698f144317 100644
--- a/dev-python/buzhug/buzhug-1.8-r1.ebuild
+++ b/dev-python/buzhug/buzhug-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/buzhug/buzhug-1.8-r1.ebuild,v 1.3 2015/03/06 22:10:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/buzhug/buzhug-1.8-r1.ebuild,v 1.4 2015/03/08 23:41:05 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
index 71329c56de38..9c8925f4a5ef 100644
--- a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
+++ b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild,v 1.4 2015/03/06 22:10:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild,v 1.5 2015/03/08 23:41:09 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ DESCRIPTION="Generate Python code objects by "assembling" bytecode"
 HOMEPAGE="http://pypi.python.org/pypi//BytecodeAssembler"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/cairocffi/cairocffi-0.6.ebuild b/dev-python/cairocffi/cairocffi-0.6.ebuild
index 4448f0b3501e..61d535d7a6bb 100644
--- a/dev-python/cairocffi/cairocffi-0.6.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cairocffi/cairocffi-0.6.ebuild,v 1.2 2015/03/06 22:10:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cairocffi/cairocffi-0.6.ebuild,v 1.3 2015/03/08 23:41:13 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/SimonSapin/cairocffi"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 # xcffib is an optional extra excpet that the testsuite has it a hard coded unconditional component
diff --git a/dev-python/carbon/carbon-0.9.13.ebuild b/dev-python/carbon/carbon-0.9.13.ebuild
index 1ad61a5f87e4..cff406ff8539 100644
--- a/dev-python/carbon/carbon-0.9.13.ebuild
+++ b/dev-python/carbon/carbon-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.13.ebuild,v 1.2 2015/03/06 22:11:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.13.ebuild,v 1.3 2015/03/08 23:41:18 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/carrot/carrot-0.10.7-r1.ebuild b/dev-python/carrot/carrot-0.10.7-r1.ebuild
index 071c6934ca6b..6dc47defa57d 100644
--- a/dev-python/carrot/carrot-0.10.7-r1.ebuild
+++ b/dev-python/carrot/carrot-0.10.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/carrot/carrot-0.10.7-r1.ebuild,v 1.2 2015/03/06 22:11:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/carrot/carrot-0.10.7-r1.ebuild,v 1.3 2015/03/08 23:41:22 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/anyjson[${PYTHON_USEDEP}]
diff --git a/dev-python/casuarius/casuarius-1.1.ebuild b/dev-python/casuarius/casuarius-1.1.ebuild
index 4ac8c31efe79..a356911619f4 100644
--- a/dev-python/casuarius/casuarius-1.1.ebuild
+++ b/dev-python/casuarius/casuarius-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/casuarius/casuarius-1.1.ebuild,v 1.2 2015/03/06 22:11:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/casuarius/casuarius-1.1.ebuild,v 1.3 2015/03/08 23:41:26 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/celery/celery-3.1.17.ebuild b/dev-python/celery/celery-3.1.17.ebuild
index 21288ff3d397..6da8f0050d88 100644
--- a/dev-python/celery/celery-3.1.17.ebuild
+++ b/dev-python/celery/celery-3.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.17.ebuild,v 1.2 2015/03/06 22:11:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.1.17.ebuild,v 1.3 2015/03/08 23:41:31 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 # There are a number of other optional 'extras' which overlap with those of kombu, however
 # there has been no apparent expression of interest or demand by users for them. See requires.txt
 IUSE="doc examples redis sqs test yaml zeromq"
diff --git a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
index 2599819ef9bf..e1fb8fa83e09 100644
--- a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
+++ b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cfgparse/cfgparse-1.3-r1.ebuild,v 1.2 2015/03/06 22:11:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cfgparse/cfgparse-1.3-r1.ebuild,v 1.3 2015/03/08 23:41:35 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="PSF-2.3"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-python/cgkit/cgkit-2.0.0.ebuild b/dev-python/cgkit/cgkit-2.0.0.ebuild
index 8d1104770963..e8bc0a66dc30 100644
--- a/dev-python/cgkit/cgkit-2.0.0.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-2.0.0.ebuild,v 1.5 2015/03/07 08:14:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-2.0.0.ebuild,v 1.6 2015/03/08 23:41:39 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -16,7 +16,7 @@ SRC_URI="$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py2k.t
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="3ds"
 
 RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
diff --git a/dev-python/chaco/chaco-4.5.0.ebuild b/dev-python/chaco/chaco-4.5.0.ebuild
index 094bd12af983..987ecac17634 100644
--- a/dev-python/chaco/chaco-4.5.0.ebuild
+++ b/dev-python/chaco/chaco-4.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chaco/chaco-4.5.0.ebuild,v 1.2 2015/03/06 22:11:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chaco/chaco-4.5.0.ebuild,v 1.3 2015/03/08 23:41:44 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild b/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild
index ce3edf57942e..a0611275587a 100644
--- a/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild
+++ b/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild,v 1.3 2015/03/07 08:15:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild,v 1.4 2015/03/08 23:41:48 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/click/click-3.3.ebuild b/dev-python/click/click-3.3.ebuild
index 46e7f84daeb1..16df955d5cbc 100644
--- a/dev-python/click/click-3.3.ebuild
+++ b/dev-python/click/click-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/click/click-3.3.ebuild,v 1.2 2015/03/06 22:11:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/click/click-3.3.ebuild,v 1.3 2015/03/08 23:41:52 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ HOMEPAGE="http://click.pocoo.org/ http://pypi.python.org/pypi/click"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc examples test"
 
diff --git a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
index dc5314db797c..cf260dd03412 100644
--- a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
+++ b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild,v 1.3 2015/03/07 08:15:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild,v 1.4 2015/03/08 23:41:56 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cliff/cliff-1.8.0.ebuild b/dev-python/cliff/cliff-1.8.0.ebuild
index 2eaa9a5d156d..a95d1e3f1386 100644
--- a/dev-python/cliff/cliff-1.8.0.ebuild
+++ b/dev-python/cliff/cliff-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cliff/cliff-1.8.0.ebuild,v 1.3 2015/03/06 22:12:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliff/cliff-1.8.0.ebuild,v 1.4 2015/03/08 23:42:00 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/codetools/codetools-4.2.0.ebuild b/dev-python/codetools/codetools-4.2.0.ebuild
index beb961c0ce44..9c2e86cb1226 100644
--- a/dev-python/codetools/codetools-4.2.0.ebuild
+++ b/dev-python/codetools/codetools-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/codetools/codetools-4.2.0.ebuild,v 1.2 2015/03/06 22:12:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/codetools/codetools-4.2.0.ebuild,v 1.3 2015/03/08 23:42:05 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 IUSE="test"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 
 RDEPEND="
diff --git a/dev-python/colander/colander-1.0.ebuild b/dev-python/colander/colander-1.0.ebuild
index 6a9648b08eda..2a4317e5af6f 100644
--- a/dev-python/colander/colander-1.0.ebuild
+++ b/dev-python/colander/colander-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-1.0.ebuild,v 1.2 2015/03/06 22:12:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-1.0.ebuild,v 1.3 2015/03/08 23:42:10 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 # MIT license is used by included (modified) iso8601.py code.
 LICENSE="repoze MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 # Depend on an ebuild of translationstring with Python 3 support.
diff --git a/dev-python/colout/colout-0.1.ebuild b/dev-python/colout/colout-0.1.ebuild
index 406e309efcc6..f3747f884224 100644
--- a/dev-python/colout/colout-0.1.ebuild
+++ b/dev-python/colout/colout-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colout/colout-0.1.ebuild,v 1.6 2015/03/06 22:12:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colout/colout-0.1.ebuild,v 1.7 2015/03/08 23:42:14 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/columnize/columnize-0.3.5-r1.ebuild b/dev-python/columnize/columnize-0.3.5-r1.ebuild
index 8a110d0a2eea..50a009c2d5ef 100644
--- a/dev-python/columnize/columnize-0.3.5-r1.ebuild
+++ b/dev-python/columnize/columnize-0.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/columnize/columnize-0.3.5-r1.ebuild,v 1.2 2015/03/06 22:12:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/columnize/columnize-0.3.5-r1.ebuild,v 1.3 2015/03/08 23:42:18 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://pycolumnize.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/common/common-0.1.1.ebuild b/dev-python/common/common-0.1.1.ebuild
index ec36cf7e2129..ffb608fe1a70 100644
--- a/dev-python/common/common-0.1.1.ebuild
+++ b/dev-python/common/common-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/common/common-0.1.1.ebuild,v 1.4 2015/03/06 22:12:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/common/common-0.1.1.ebuild,v 1.5 2015/03/08 23:42:22 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT="mirror bindist"
diff --git a/dev-python/configargparse/configargparse-0.9.3.ebuild b/dev-python/configargparse/configargparse-0.9.3.ebuild
index 1188156a8f31..8a36d192b316 100644
--- a/dev-python/configargparse/configargparse-0.9.3.ebuild
+++ b/dev-python/configargparse/configargparse-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configargparse/configargparse-0.9.3.ebuild,v 1.2 2015/03/06 22:12:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configargparse/configargparse-0.9.3.ebuild,v 1.3 2015/03/08 23:42:26 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -16,6 +16,6 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/configobj/configobj-5.0.5.ebuild b/dev-python/configobj/configobj-5.0.5.ebuild
index fb323ffa0bc0..c03c951ae523 100644
--- a/dev-python/configobj/configobj-5.0.5.ebuild
+++ b/dev-python/configobj/configobj-5.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-5.0.5.ebuild,v 1.5 2015/03/07 00:15:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-5.0.5.ebuild,v 1.6 2015/03/08 23:42:30 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/configparser/configparser-3.3.0.2.ebuild b/dev-python/configparser/configparser-3.3.0.2.ebuild
index 3f06ec200ecf..7776bd28a1bf 100644
--- a/dev-python/configparser/configparser-3.3.0.2.ebuild
+++ b/dev-python/configparser/configparser-3.3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configparser/configparser-3.3.0.2.ebuild,v 1.2 2015/03/06 22:12:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configparser/configparser-3.3.0.2.ebuild,v 1.3 2015/03/08 23:42:34 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 ) # 2_6 possible with extra deps
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-python/contextlib2/contextlib2-0.4.0.ebuild b/dev-python/contextlib2/contextlib2-0.4.0.ebuild
index 9d199c0663cc..43e92ba56a6b 100644
--- a/dev-python/contextlib2/contextlib2-0.4.0.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/contextlib2/contextlib2-0.4.0.ebuild,v 1.6 2015/03/06 22:12:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/contextlib2/contextlib2-0.4.0.ebuild,v 1.7 2015/03/08 23:42:38 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 python_test() {
diff --git a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
index 7b50aac055de..c4843cbe5bf3 100644
--- a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
+++ b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild,v 1.2 2015/03/06 22:12:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild,v 1.3 2015/03/08 23:42:42 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/crcmod/crcmod-1.7-r2.ebuild b/dev-python/crcmod/crcmod-1.7-r2.ebuild
index d13a4836d384..c58ce5b1e455 100644
--- a/dev-python/crcmod/crcmod-1.7-r2.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/crcmod/crcmod-1.7-r2.ebuild,v 1.2 2015/03/06 22:12:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/crcmod/crcmod-1.7-r2.ebuild,v 1.3 2015/03/08 23:42:46 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DOCS=( changelog test/examples.py )
diff --git a/dev-python/cssutils/cssutils-0.9.10-r1.ebuild b/dev-python/cssutils/cssutils-0.9.10-r1.ebuild
index b2b1f07042d3..ccbb726822b4 100644
--- a/dev-python/cssutils/cssutils-0.9.10-r1.ebuild
+++ b/dev-python/cssutils/cssutils-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.10-r1.ebuild,v 1.7 2015/03/07 08:15:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.10-r1.ebuild,v 1.8 2015/03/08 23:42:50 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -17,7 +17,7 @@ SRC_URI="https://bitbucket.org/cthedot/cssutils/get/${HG_COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="examples test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython/cython-0.22.ebuild b/dev-python/cython/cython-0.22.ebuild
index 50d092aef26f..097c48022c4a 100644
--- a/dev-python/cython/cython-0.22.ebuild
+++ b/dev-python/cython/cython-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.22.ebuild,v 1.4 2015/03/07 08:15:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.22.ebuild,v 1.5 2015/03/08 23:42:55 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/dev-python/cytoolz/cytoolz-0.7.1.ebuild b/dev-python/cytoolz/cytoolz-0.7.1.ebuild
index a36623d43ac3..712e670155ab 100644
--- a/dev-python/cytoolz/cytoolz-0.7.1.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cytoolz/cytoolz-0.7.1.ebuild,v 1.3 2015/03/06 22:13:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cytoolz/cytoolz-0.7.1.ebuild,v 1.4 2015/03/08 23:43:00 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/d2to1/d2to1-0.2.11.ebuild b/dev-python/d2to1/d2to1-0.2.11.ebuild
index ed466e0d3784..d0333b06ec21 100644
--- a/dev-python/d2to1/d2to1-0.2.11.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.11.ebuild,v 1.6 2015/03/06 22:13:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.11.ebuild,v 1.7 2015/03/08 23:43:04 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dap/dap-2.2.6.7-r1.ebuild b/dev-python/dap/dap-2.2.6.7-r1.ebuild
index 1248e3e0fb2a..706bd7d497df 100644
--- a/dev-python/dap/dap-2.2.6.7-r1.ebuild
+++ b/dev-python/dap/dap-2.2.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dap/dap-2.2.6.7-r1.ebuild,v 1.2 2015/03/06 22:13:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dap/dap-2.2.6.7-r1.ebuild,v 1.3 2015/03/08 23:43:08 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="server"
 
 RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]
diff --git a/dev-python/datashape/datashape-0.4.2.ebuild b/dev-python/datashape/datashape-0.4.2.ebuild
index aea76ad7ed98..0256ef0ec48e 100644
--- a/dev-python/datashape/datashape-0.4.2.ebuild
+++ b/dev-python/datashape/datashape-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.2.ebuild,v 1.2 2015/03/06 22:13:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/datashape/datashape-0.4.2.ebuild,v 1.3 2015/03/08 23:43:12 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/dbutils/dbutils-1.1-r1.ebuild b/dev-python/dbutils/dbutils-1.1-r1.ebuild
index 47c53760d946..2e1bab3ff190 100644
--- a/dev-python/dbutils/dbutils-1.1-r1.ebuild
+++ b/dev-python/dbutils/dbutils-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbutils/dbutils-1.1-r1.ebuild,v 1.3 2015/03/07 08:15:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbutils/dbutils-1.1-r1.ebuild,v 1.4 2015/03/08 23:43:17 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="http://www.webwareforpython.org/downloads/DBUtils/${MY_P}.tar.gz"
 
 LICENSE="OSL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc examples"
 
 DEPEND=""
diff --git a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
index 6ac64739177c..6e267f1d838b 100644
--- a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
+++ b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decoratortools/decoratortools-1.8-r1.ebuild,v 1.6 2015/03/07 08:15:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decoratortools/decoratortools-1.8-r1.ebuild,v 1.7 2015/03/08 23:43:21 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="|| ( PSF-2 ZPL )"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild
index 9fae55aea09e..fb4310729b16 100644
--- a/dev-python/deform/deform-0.9.9.ebuild
+++ b/dev-python/deform/deform-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.9.ebuild,v 1.4 2015/03/06 22:13:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.9.ebuild,v 1.5 2015/03/08 23:43:25 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 # tests require zope.deprecation
 RESTRICT="test"
diff --git a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
index 99a892d5bb9b..24768cbe8082 100644
--- a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild,v 1.3 2015/03/06 22:14:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild,v 1.4 2015/03/08 23:43:30 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa x86"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/dicttoxml/dicttoxml-1.5.6.ebuild b/dev-python/dicttoxml/dicttoxml-1.5.6.ebuild
index c359c7948ed2..b2e925da1b94 100644
--- a/dev-python/dicttoxml/dicttoxml-1.5.6.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dicttoxml/dicttoxml-1.5.6.ebuild,v 1.2 2015/03/06 22:14:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dicttoxml/dicttoxml-1.5.6.ebuild,v 1.3 2015/03/08 23:43:34 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_7,3_3,3_4})
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/dingus/dingus-0.3.4-r1.ebuild b/dev-python/dingus/dingus-0.3.4-r1.ebuild
index 250ce4f5a850..ec24ea4416b2 100644
--- a/dev-python/dingus/dingus-0.3.4-r1.ebuild
+++ b/dev-python/dingus/dingus-0.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dingus/dingus-0.3.4-r1.ebuild,v 1.4 2015/03/06 22:14:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dingus/dingus-0.3.4-r1.ebuild,v 1.5 2015/03/08 23:43:38 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/discogs-client/discogs-client-2.0.2.ebuild b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
index faa0e2d960d3..e7f15baacd19 100644
--- a/dev-python/discogs-client/discogs-client-2.0.2.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/discogs-client/discogs-client-2.0.2.ebuild,v 1.2 2015/03/06 22:14:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/discogs-client/discogs-client-2.0.2.ebuild,v 1.3 2015/03/08 23:43:42 pacho Exp $
 
 EAPI=5
 # Not py3 capable due to oauth2 supports py2 pypy only
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/discogs/${PN/-/_}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/oauth2[${PYTHON_USEDEP}]"
diff --git a/dev-python/disqus-python/disqus-python-0.4.2.ebuild b/dev-python/disqus-python/disqus-python-0.4.2.ebuild
index dd080b97668d..07bd6a70cdbe 100644
--- a/dev-python/disqus-python/disqus-python-0.4.2.ebuild
+++ b/dev-python/disqus-python/disqus-python-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/disqus-python/disqus-python-0.4.2.ebuild,v 1.3 2015/03/06 22:14:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/disqus-python/disqus-python-0.4.2.ebuild,v 1.4 2015/03/08 23:43:46 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/django-annoying/django-annoying-0.7.7.ebuild b/dev-python/django-annoying/django-annoying-0.7.7.ebuild
index 63ce0a4520f1..0f1bfa78b911 100644
--- a/dev-python/django-annoying/django-annoying-0.7.7.ebuild
+++ b/dev-python/django-annoying/django-annoying-0.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-annoying/django-annoying-0.7.7.ebuild,v 1.4 2015/03/06 22:14:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-annoying/django-annoying-0.7.7.ebuild,v 1.5 2015/03/08 23:43:50 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-appconf/django-appconf-0.6.ebuild b/dev-python/django-appconf/django-appconf-0.6.ebuild
index a0a0bb2ccbc7..e236d076a510 100644
--- a/dev-python/django-appconf/django-appconf-0.6.ebuild
+++ b/dev-python/django-appconf/django-appconf-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-appconf/django-appconf-0.6.ebuild,v 1.7 2015/03/06 22:14:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-appconf/django-appconf-0.6.ebuild,v 1.8 2015/03/08 23:43:54 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
 HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/"
 SRC_URI="https://github.com/jezdez/${PN}/archive/v${PV}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 LICENSE="BSD"
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
index 8f830961612a..06a6c947d044 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild,v 1.3 2015/03/06 22:14:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild,v 1.4 2015/03/08 23:43:58 pacho Exp $
 
 EAPI=5
 # Although setup.py claims to support py3, python-ldap does not
@@ -12,7 +12,7 @@ DESCRIPTION="Django LDAP authentication backend"
 HOMEPAGE="http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 LICENSE="BSD"
diff --git a/dev-python/django-celery/django-celery-3.1.16.ebuild b/dev-python/django-celery/django-celery-3.1.16.ebuild
index 50d96c7b5fe5..e5e228f0ebc5 100644
--- a/dev-python/django-celery/django-celery-3.1.16.ebuild
+++ b/dev-python/django-celery/django-celery-3.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/django-celery-3.1.16.ebuild,v 1.2 2015/03/06 22:14:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/django-celery-3.1.16.ebuild,v 1.3 2015/03/08 23:44:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
diff --git a/dev-python/django-compressor/django-compressor-1.4.ebuild b/dev-python/django-compressor/django-compressor-1.4.ebuild
index 218f5e7360f0..cc9e51b92fb1 100644
--- a/dev-python/django-compressor/django-compressor-1.4.ebuild
+++ b/dev-python/django-compressor/django-compressor-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/django-compressor-1.4.ebuild,v 1.5 2015/03/06 22:14:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/django-compressor-1.4.ebuild,v 1.6 2015/03/08 23:44:06 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ MY_PN="${PN/-/_}"
 DESCRIPTION="Compresses linked and inline javascript or CSS into a single cached file"
 HOMEPAGE="https://github.com/django-compressor/django-compressor"
 SRC_URI="https://github.com/jezdez/django_compressor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 LICENSE="MIT"
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild
index 202ef9fa8035..fb2926a8301c 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild,v 1.2 2015/03/06 22:14:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild,v 1.3 2015/03/08 23:44:11 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A configurable set of panels that display debug information"
 HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/
 	https://github.com/django-debug-toolbar/django-debug-toolbar/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 LICENSE="BSD"
diff --git a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
index 3bb88018b2f5..ccb0e10edf0f 100644
--- a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
+++ b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild,v 1.4 2015/03/06 22:15:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild,v 1.5 2015/03/08 23:44:16 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild b/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
index 36c4a9a0f7ee..bdb9bdc5e480 100644
--- a/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
+++ b/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild,v 1.3 2015/03/06 22:15:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild,v 1.4 2015/03/08 23:44:20 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/frankban/django-endless-pagination/archive/v${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/django-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-evolution/django-evolution-0.7.4.ebuild b/dev-python/django-evolution/django-evolution-0.7.4.ebuild
index 5ce35addeff9..397842146d82 100644
--- a/dev-python/django-evolution/django-evolution-0.7.4.ebuild
+++ b/dev-python/django-evolution/django-evolution-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.7.4.ebuild,v 1.2 2015/03/06 22:15:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.7.4.ebuild,v 1.3 2015/03/08 23:44:24 pacho Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.reviewboard.org/releases/${PN}/${RELEASE}/${MY_P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-haystack/django-haystack-2.2.0.ebuild b/dev-python/django-haystack/django-haystack-2.2.0.ebuild
index f822c1d67c2b..e648c355ea8e 100644
--- a/dev-python/django-haystack/django-haystack-2.2.0.ebuild
+++ b/dev-python/django-haystack/django-haystack-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-haystack/django-haystack-2.2.0.ebuild,v 1.2 2015/03/06 22:15:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-haystack/django-haystack-2.2.0.ebuild,v 1.3 2015/03/08 23:44:28 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-international/django-international-0.0.6.ebuild b/dev-python/django-international/django-international-0.0.6.ebuild
index 32332baeddbf..fad5cde14a78 100644
--- a/dev-python/django-international/django-international-0.0.6.ebuild
+++ b/dev-python/django-international/django-international-0.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-international/django-international-0.0.6.ebuild,v 1.3 2015/03/06 22:15:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-international/django-international-0.0.6.ebuild,v 1.4 2015/03/08 23:44:32 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
index a38bae357032..6ff3b1b9e646 100644
--- a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
+++ b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild,v 1.2 2015/03/06 22:15:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild,v 1.3 2015/03/08 23:44:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -11,7 +11,7 @@ DESCRIPTION="A reusable application for the Django web framework"
 HOMEPAGE="http://code.google.com/p/django-ldap-groups"
 SRC_URI="http://django-ldap-groups.googlecode.com/files/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild b/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild
index 59d9b67f361c..f3ef859182a6 100644
--- a/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild
+++ b/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild,v 1.2 2015/03/06 22:15:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild,v 1.3 2015/03/08 23:44:40 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -11,7 +11,7 @@ DESCRIPTION="An LDAP database backend for Django"
 HOMEPAGE="https://github.com/jlaine/django-ldapdb"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/django-nose/django-nose-1.3.ebuild b/dev-python/django-nose/django-nose-1.3.ebuild
index 5b26b011c2e2..52e4ca54ca74 100644
--- a/dev-python/django-nose/django-nose-1.3.ebuild
+++ b/dev-python/django-nose/django-nose-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-nose/django-nose-1.3.ebuild,v 1.2 2015/03/06 22:15:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-nose/django-nose-1.3.ebuild,v 1.3 2015/03/08 23:44:45 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/django-oauth-plus/django-oauth-plus-2.2.5.ebuild b/dev-python/django-oauth-plus/django-oauth-plus-2.2.5.ebuild
index 455f6f049ab5..1969c25d6077 100644
--- a/dev-python/django-oauth-plus/django-oauth-plus-2.2.5.ebuild
+++ b/dev-python/django-oauth-plus/django-oauth-plus-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-oauth-plus/django-oauth-plus-2.2.5.ebuild,v 1.2 2015/03/06 22:15:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-oauth-plus/django-oauth-plus-2.2.5.ebuild,v 1.3 2015/03/08 23:44:49 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/django-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild b/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild
index df06b1ac5892..0fe4c1149771 100644
--- a/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild
+++ b/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild,v 1.2 2015/03/06 22:15:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild,v 1.3 2015/03/08 23:44:53 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild
index 48336b4e1083..ea2d8e94ac90 100644
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild
+++ b/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild,v 1.2 2015/03/06 22:16:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild,v 1.3 2015/03/08 23:44:57 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ S="${WORKDIR}/django_openstack_auth-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild b/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild
index 5621adb8d9e1..e71a22db50f4 100644
--- a/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild
+++ b/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild,v 1.3 2015/03/06 22:16:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild,v 1.4 2015/03/08 23:45:02 pacho Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/django-1.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
index f66c76602d1a..2aa05e2d7194 100644
--- a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
+++ b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild,v 1.3 2015/03/06 22:16:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild,v 1.4 2015/03/08 23:45:06 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]
diff --git a/dev-python/django-piston/django-piston-0.2.3-r1.ebuild b/dev-python/django-piston/django-piston-0.2.3-r1.ebuild
index d660d00e4866..14e666533da0 100644
--- a/dev-python/django-piston/django-piston-0.2.3-r1.ebuild
+++ b/dev-python/django-piston/django-piston-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-piston/django-piston-0.2.3-r1.ebuild,v 1.5 2015/03/06 22:16:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-piston/django-piston-0.2.3-r1.ebuild,v 1.6 2015/03/08 23:45:11 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild
index 3185af70dd2b..b7c707be1db6 100644
--- a/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild
+++ b/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild,v 1.2 2015/03/06 22:16:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild,v 1.3 2015/03/08 23:45:15 pacho Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-select2/django-select2-4.2.2.ebuild b/dev-python/django-select2/django-select2-4.2.2.ebuild
index 1244d2753756..657f5eda4aec 100644
--- a/dev-python/django-select2/django-select2-4.2.2.ebuild
+++ b/dev-python/django-select2/django-select2-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-select2/django-select2-4.2.2.ebuild,v 1.2 2015/03/06 22:16:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-select2/django-select2-4.2.2.ebuild,v 1.3 2015/03/08 23:45:19 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild b/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
index 7eb51a3c9e69..f5a59bddeaee 100644
--- a/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
+++ b/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild,v 1.2 2015/03/06 22:16:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild,v 1.3 2015/03/08 23:45:23 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pep8[${PYTHON_USEDEP}]
diff --git a/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild b/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
index 8ab3d7415f19..f440b72bbbf1 100644
--- a/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
+++ b/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild,v 1.2 2015/03/06 22:16:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild,v 1.3 2015/03/08 23:45:27 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="An easy to setup social authentication/authorization mechanism for Django projects"
 HOMEPAGE="http://pypi.python.org/pypi/django-social-auth/"
 SRC_URI="https://github.com/omab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 LICENSE="BSD"
diff --git a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
index a4caa5065fb8..84c591a76cbe 100644
--- a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild,v 1.5 2015/03/06 22:16:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild,v 1.6 2015/03/08 23:45:31 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -11,7 +11,7 @@ DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
 HOMEPAGE="http://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie"
 SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bip doc digest lxml oauth test yaml"
 
 LICENSE="BSD"
diff --git a/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild b/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
index f82dcfdde3bf..8a39702d1c79 100644
--- a/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
+++ b/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild,v 1.3 2015/03/06 22:17:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild,v 1.4 2015/03/08 23:45:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 DESCRIPTION="an XSLT template system for Django"
 HOMEPAGE="http://pypi.python.org/pypi/django-xslt/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 LICENSE="BSD"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index a43992881fe7..561af17a62f0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,4 +1,4 @@
 DIST Django-1.4.19.tar.gz 7877522 SHA256 d75d605e574305e1c2864c392e1454963ead4552477ce14e67e64b9ef9faa1a6 SHA512 811267ec1ad99a8eaf4daa098cd5140970718f5814ed1e7e9ab706ff049c508a788cf186aafe208947e6350e17baef4a205f549bba744ef53c7e365a101a9391 WHIRLPOOL 67b24ddd89a31294cb260923b58e31dadfd6b4fe654a625586bc9341ba95f9bb2960befdd58dfae91128149fba1b95c3dcef9f72510e3e904cb03de8b685d63c
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
 DIST Django-1.6.10.tar.gz 6760152 SHA256 54eb59ce785401c7d1fdeed245efce597e90f811d6a20f6b5c6931c0049d63a6 SHA512 4ef44f2f4d0537443125765ab0e13b0d4798f828b09e7f881f2841d8e7078e4a8f0ac4750ebbd4586190feacd13490d4657575411737d2dc1e3c2cf046c2dadf WHIRLPOOL 8cbcfd690aa813b72da2f8480fcf66de87179a92a802450d354c1c383a7df415b3346d1a8a913a717b39db6edb67bcafd0fa0f45da55a2284e3e23c4fe45803f
-DIST Django-1.7.5.tar.gz 7599017 SHA256 1c391f9349c97df503dac3461599f24235e4d04393498e6060e74dd2721460bc SHA512 b54c8afaf1a07475fc4952c9af94fa77cb9d18fcdbc98c3d61406201fdcff3fc997d831b26914fbd1db05cdeeafeda67de7476c1bf4ec125c6f00aa69a127f77 WHIRLPOOL b3e957dc0bc852a0983d3aa01e82183de4dc7eda68dc1e893d4fee8df4f04e39979fd6285ac615d9e8ec8d2fe4d75e120b9dd06ae1e77cd5d61ab795f67db1a6
+DIST Django-1.7.6.tar.gz 7601179 SHA256 b0f15e0ffe59a2f37cbaf53543f05d2f40c5a755390df03ec0655b5e4a8d4c90 SHA512 e3f198483ee2d1209abfffe6132ba93d1ef3c7e0b38685af6ed611667241116b2a3e6dc06ec8adfa19bf2dd5fe76d195bef6f914b8db231eaf7b38a6060852a8 WHIRLPOOL 977fa00c91166ea0151e2bac9c962b88e2c6a0f0e5a38f63c851995afb6539659614cbe094d1a2902ee382fed3083059ab23e00491193c8bbc34e5f83054f6f6
diff --git a/dev-python/django/django-1.7.5.ebuild b/dev-python/django/django-1.7.6.ebuild
similarity index 98%
rename from dev-python/django/django-1.7.5.ebuild
rename to dev-python/django/django-1.7.6.ebuild
index 287cf5220a3a..020437b758d0 100644
--- a/dev-python/django/django-1.7.5.ebuild
+++ b/dev-python/django/django-1.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.5.ebuild,v 1.2 2015/02/28 18:08:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.6.ebuild,v 1.1 2015/03/09 16:26:41 jlec Exp $
 
 EAPI=5
 
diff --git a/dev-python/django/files/django-1.7.5-bashcomp.patch b/dev-python/django/files/django-1.7.6-bashcomp.patch
similarity index 100%
rename from dev-python/django/files/django-1.7.5-bashcomp.patch
rename to dev-python/django/files/django-1.7.6-bashcomp.patch
diff --git a/dev-python/docopt/docopt-0.6.2.ebuild b/dev-python/docopt/docopt-0.6.2.ebuild
index 1f3322a27118..ad1cc038d64d 100644
--- a/dev-python/docopt/docopt-0.6.2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docopt/docopt-0.6.2.ebuild,v 1.4 2015/03/06 22:17:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docopt/docopt-0.6.2.ebuild,v 1.5 2015/03/08 23:45:40 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
index c76cdcdec546..5d9f1377ab1e 100644
--- a/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
+++ b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild,v 1.3 2015/03/06 22:17:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild,v 1.4 2015/03/08 23:45:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.core-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index ae74ff3b06e3..48b05fa0652d 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,2 +1,3 @@
 DIST doit-0.20.0.tar.gz 318963 SHA256 78c5e9c4db69871e2cacadad3c73a051f6833d2baf0f13c40676b2ccea061166 SHA512 e75c83888a5ea0c3cea3b6dae4c266306c2f607e465d1f94953384bacedaeaa1b7067dc1449d08d08c9969b5d4376187342c2fc8f729be3bc90a8b16a8d8bc8e WHIRLPOOL 6b8995ea02b39d3aca24834958dc88c67d8c5c1e367153a0f27e45b97f273c65ba8f63d713d5754dec266dfeac7a4d8726d91f414a574a85a19c5e836f38d617
 DIST doit-0.23.0.tar.gz 316588 SHA256 5d0421be6e5528e3be11bd0ede5c232e0c91f2b98b55688d7db1ce0638e1efbb SHA512 f2298d76d9ce3e7ed5f356bfdeeef8d5d99ebae74571666a3d2b3843fc63f5a8f76cd6cdedcfe8fc81bc653ecf04951c11f50abd16e9aa8fc7539e3c224b0e4c WHIRLPOOL cfb09484e25cfbc9618ef5b4a750010d16281a13772a37a8da59f2f6e1ebed77bbc40c06f263062c0464e6689415aeac695c0ef9e5cfe561349efea61f8be8e3
+DIST doit-0.27.0.tar.gz 193700 SHA256 06662c8677fb3e925c262559b7d3c5d8e08a10320be3386a7d348702e8e3ed8a SHA512 afca1029873c9fca0632ef43bc75762eed0738b7e4c1b8e9babf10543b15f78c526794462a83fa2fac1b35f2ff9152afbce8660b1dfbd86ce9dd73d47c70a9f7 WHIRLPOOL 60c022977b6dfe9e3e66d206315ac23a291c4df58bc07b4f8120622f257b636b80340dc267e5615de5876d40a500cf0fbaf3f531c6f41dce53d91ebdc6d65d7e
diff --git a/dev-python/doit/doit-0.27.0.ebuild b/dev-python/doit/doit-0.27.0.ebuild
new file mode 100644
index 000000000000..a30ccea94170
--- /dev/null
+++ b/dev-python/doit/doit-0.27.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/doit/doit-0.27.0.ebuild,v 1.1 2015/03/09 11:16:01 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+inherit eutils distutils-r1
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="http://python-doit.sourceforge.net/ http://pypi.python.org/pypi/doit"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+DOCS=( AUTHORS CHANGES README.rst TODO.txt dev_requirements.txt )
+
+python_prepare_all() {
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+	# Tests of this file fail due to setting of a tmp dir which can be fixed.
+	# This known spurious cause does not warrant halting a testsuite
+	rm -f tests/test_cmd_strace.py || die
+
+	# These 2 tests succeed on running the suite a second time, so they are NOT broken
+	# A gentoo test phase is run only once, so these unbroken tests can be safely skipped.
+	sed -e s':testInit:_&:' -e s':testLoop:_&:' \
+		-i tests/test_filewatch.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Testsuite is designed to be run by py.test, called by runtests.py
+	# https://bitbucket.org/schettino72/doit/issue/78/tests-that-fail-under-pypy
+	if [[ "${EPYTHON}" == pypy-c2.0 ]]; then
+		sed -e 's:test_corrupted_file:_&:' \
+			-e 's:test_corrupted_file_unrecognized_excep_pdep:_&:' \
+			-i tests/test_dependency.py || die
+	elif [[ "${EPYTHON}" == python2.6 ]]; then
+		rm -f tests/test___main__.py || die
+		sed -e 's:test_invalid_param_stdout:_&:' \
+			-i tests/test_action.py || die
+		sed -e 's:test_run_wait:_&:' \
+			-i tests/test_cmd_auto.py || die
+	fi
+	"${PYTHON}" runtests.py
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodoc -r doc
+	docompress -x /usr/share/doc/${PF}/doc
+}
diff --git a/dev-python/dpkt/dpkt-1.8-r1.ebuild b/dev-python/dpkt/dpkt-1.8-r1.ebuild
index 1b5423478749..26c087824cd3 100644
--- a/dev-python/dpkt/dpkt-1.8-r1.ebuild
+++ b/dev-python/dpkt/dpkt-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dpkt/dpkt-1.8-r1.ebuild,v 1.2 2015/03/06 22:17:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dpkt/dpkt-1.8-r1.ebuild,v 1.3 2015/03/08 23:45:48 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 DEPEND=""
diff --git a/dev-python/dreampie/dreampie-1.2.1.ebuild b/dev-python/dreampie/dreampie-1.2.1.ebuild
index 8941ec8a3f3c..3d8b1126cbae 100644
--- a/dev-python/dreampie/dreampie-1.2.1.ebuild
+++ b/dev-python/dreampie/dreampie-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dreampie/dreampie-1.2.1.ebuild,v 1.2 2015/03/06 22:17:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dreampie/dreampie-1.2.1.ebuild,v 1.3 2015/03/08 23:45:52 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/drpython/drpython-3.11.4.ebuild b/dev-python/drpython/drpython-3.11.4.ebuild
index a3a3afee8eb6..fd79db95cd03 100644
--- a/dev-python/drpython/drpython-3.11.4.ebuild
+++ b/dev-python/drpython/drpython-3.11.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-3.11.4.ebuild,v 1.3 2015/03/07 08:15:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-3.11.4.ebuild,v 1.4 2015/03/08 23:45:56 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/wxpython-2.6"
diff --git a/dev-python/dugong/dugong-3.4.ebuild b/dev-python/dugong/dugong-3.4.ebuild
index 1a472477bc9f..f1b15e802dae 100644
--- a/dev-python/dugong/dugong-3.4.ebuild
+++ b/dev-python/dugong/dugong-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/dugong-3.4.ebuild,v 1.2 2015/03/06 22:17:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dugong/dugong-3.4.ebuild,v 1.3 2015/03/08 23:46:00 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python3_{3,4} )
@@ -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/dynd-python/dynd-python-0.6.5.ebuild b/dev-python/dynd-python/dynd-python-0.6.5.ebuild
index 76a1192568b5..9e9bc52a9e00 100644
--- a/dev-python/dynd-python/dynd-python-0.6.5.ebuild
+++ b/dev-python/dynd-python/dynd-python-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dynd-python/dynd-python-0.6.5.ebuild,v 1.2 2015/03/06 22:17:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dynd-python/dynd-python-0.6.5.ebuild,v 1.3 2015/03/08 23:46:04 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-1.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-1.4.0.ebuild
index 0f973e35c628..ac38318f37a2 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-1.4.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/elasticsearch-py/elasticsearch-py-1.4.0.ebuild,v 1.2 2015/03/06 22:17:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elasticsearch-py/elasticsearch-py-1.4.0.ebuild,v 1.3 2015/03/08 23:46:09 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips x86"
 IUSE=""
 
 DEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/embedly/embedly-0.4.3-r1.ebuild b/dev-python/embedly/embedly-0.4.3-r1.ebuild
index 5bbd24030852..34e8bbb6805c 100644
--- a/dev-python/embedly/embedly-0.4.3-r1.ebuild
+++ b/dev-python/embedly/embedly-0.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/embedly/embedly-0.4.3-r1.ebuild,v 1.2 2015/03/06 22:18:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/embedly/embedly-0.4.3-r1.ebuild,v 1.3 2015/03/08 23:46:13 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/enable/enable-4.4.1.ebuild b/dev-python/enable/enable-4.4.1.ebuild
index a1ea0a0ece64..d25d854f6adc 100644
--- a/dev-python/enable/enable-4.4.1.ebuild
+++ b/dev-python/enable/enable-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.4.1.ebuild,v 1.3 2015/03/07 11:31:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.4.1.ebuild,v 1.4 2015/03/08 23:46:17 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/enthought/${PN}/archive/${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/enaml/enaml-0.6.8-r1.ebuild b/dev-python/enaml/enaml-0.6.8-r1.ebuild
index 9d6931fceab0..acde95155661 100644
--- a/dev-python/enaml/enaml-0.6.8-r1.ebuild
+++ b/dev-python/enaml/enaml-0.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.6.8-r1.ebuild,v 1.3 2015/03/06 22:18:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.6.8-r1.ebuild,v 1.4 2015/03/08 23:46:22 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/enaml/enaml-0.9.8.ebuild b/dev-python/enaml/enaml-0.9.8.ebuild
index 2e1179f1232a..761d590d9738 100644
--- a/dev-python/enaml/enaml-0.9.8.ebuild
+++ b/dev-python/enaml/enaml-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.9.8.ebuild,v 1.2 2015/03/06 22:18:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enaml/enaml-0.9.8.ebuild,v 1.3 2015/03/08 23:46:22 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/encore/encore-0.4.0.ebuild b/dev-python/encore/encore-0.4.0.ebuild
index 36bfb8e1a5a5..dde52c5c9e7d 100644
--- a/dev-python/encore/encore-0.4.0.ebuild
+++ b/dev-python/encore/encore-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.4.0.ebuild,v 1.3 2015/03/06 22:18:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.4.0.ebuild,v 1.4 2015/03/08 23:46:27 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/dev-python/encore/encore-0.5.1.ebuild b/dev-python/encore/encore-0.5.1.ebuild
index 736ea2e30e69..40a9a6e41503 100644
--- a/dev-python/encore/encore-0.5.1.ebuild
+++ b/dev-python/encore/encore-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v 1.4 2015/03/06 22:18:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/encore/encore-0.5.1.ebuild,v 1.5 2015/03/08 23:46:27 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
diff --git a/dev-python/enum34/enum34-1.0.ebuild b/dev-python/enum34/enum34-1.0.ebuild
index c70908e816c6..8595d6f4f2de 100644
--- a/dev-python/enum34/enum34-1.0.ebuild
+++ b/dev-python/enum34/enum34-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.ebuild,v 1.7 2015/03/06 22:18:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.ebuild,v 1.8 2015/03/08 23:46:32 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} pypy pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="doc"
 
 DEPEND=""
diff --git a/dev-python/envisage/envisage-4.4.0.ebuild b/dev-python/envisage/envisage-4.4.0.ebuild
index b861bcf41282..9b390c304023 100644
--- a/dev-python/envisage/envisage-4.4.0.ebuild
+++ b/dev-python/envisage/envisage-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/envisage/envisage-4.4.0.ebuild,v 1.2 2015/03/06 22:18:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/envisage/envisage-4.4.0.ebuild,v 1.3 2015/03/08 23:46:36 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=">=dev-python/traits-4[${PYTHON_USEDEP}]"
diff --git a/dev-python/envoy/envoy-0.0.3.ebuild b/dev-python/envoy/envoy-0.0.3.ebuild
index af33679c2878..c20dec56f8e7 100644
--- a/dev-python/envoy/envoy-0.0.3.ebuild
+++ b/dev-python/envoy/envoy-0.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/envoy/envoy-0.0.3.ebuild,v 1.2 2015/03/06 22:18:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/envoy/envoy-0.0.3.ebuild,v 1.3 2015/03/08 23:46:40 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/epsilon/epsilon-0.7.0.ebuild b/dev-python/epsilon/epsilon-0.7.0.ebuild
index f8bbe5ea83a8..38e7d4bc2b9a 100644
--- a/dev-python/epsilon/epsilon-0.7.0.ebuild
+++ b/dev-python/epsilon/epsilon-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/epsilon-0.7.0.ebuild,v 1.4 2015/03/07 08:16:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/epsilon-0.7.0.ebuild,v 1.5 2015/03/08 23:46:44 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -11,7 +11,7 @@ DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time cla
 HOMEPAGE="http://divmod.org/trac/wiki/DivmodEpsilon http://pypi.python.org/pypi/Epsilon"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
index 8cb214940982..81719a0af6cb 100644
--- a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
+++ b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild,v 1.2 2015/03/06 22:18:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild,v 1.3 2015/03/08 23:46:48 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -11,7 +11,7 @@ DESCRIPTION="A logging framework handler that tracks when messages above a certa
 HOMEPAGE="http://pypi.python.org/pypi/errorhandler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 LICENSE="MIT"
diff --git a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
index a92080064fc1..d46486a6652d 100644
--- a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
+++ b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild,v 1.4 2015/03/07 08:16:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild,v 1.5 2015/03/08 23:46:52 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
index 5455898c9a69..22c9055aa020 100644
--- a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
+++ b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild,v 1.5 2015/03/07 08:16:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild,v 1.6 2015/03/08 23:46:57 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="!<dev-python/apptools-4
diff --git a/dev-python/eventlet/eventlet-0.13.0.ebuild b/dev-python/eventlet/eventlet-0.13.0.ebuild
index eb13b962e09c..36b1db3de3d3 100644
--- a/dev-python/eventlet/eventlet-0.13.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.13.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eventlet/eventlet-0.13.0.ebuild,v 1.2 2015/03/06 22:19:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eventlet/eventlet-0.13.0.ebuild,v 1.3 2015/03/08 23:47:01 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/execnet/execnet-1.2.0-r2.ebuild b/dev-python/execnet/execnet-1.2.0-r2.ebuild
index a6ec42614fe5..d43ee43daf71 100644
--- a/dev-python/execnet/execnet-1.2.0-r2.ebuild
+++ b/dev-python/execnet/execnet-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/execnet/execnet-1.2.0-r2.ebuild,v 1.3 2015/03/06 22:19:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/execnet/execnet-1.2.0-r2.ebuild,v 1.4 2015/03/08 23:47:07 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/extremes/extremes-1.1.1.ebuild b/dev-python/extremes/extremes-1.1.1.ebuild
index 4678c733ed58..66de2bd8ccf5 100644
--- a/dev-python/extremes/extremes-1.1.1.ebuild
+++ b/dev-python/extremes/extremes-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/extremes/extremes-1.1.1.ebuild,v 1.4 2015/03/06 22:19:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/extremes/extremes-1.1.1.ebuild,v 1.5 2015/03/08 23:47:11 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -12,7 +12,7 @@ DESCRIPTION="Production-quality 'Min' and 'Max' objects"
 HOMEPAGE="http://pypi.python.org/pypi/Extremes"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/feedgenerator/feedgenerator-1.7.ebuild b/dev-python/feedgenerator/feedgenerator-1.7.ebuild
index 7017957e57e7..90906e51eba0 100644
--- a/dev-python/feedgenerator/feedgenerator-1.7.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.7.ebuild,v 1.4 2015/03/06 22:19:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.7.ebuild,v 1.5 2015/03/08 23:47:15 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
index bd2b8fc5e91e..9d63d1bf2351 100644
--- a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
+++ b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.3-r2.ebuild,v 1.9 2015/03/07 08:16:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.3-r2.ebuild,v 1.10 2015/03/08 23:47:19 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fexpect/fexpect-0.2.ebuild b/dev-python/fexpect/fexpect-0.2.ebuild
index 80e618f288b2..86da526ebde8 100644
--- a/dev-python/fexpect/fexpect-0.2.ebuild
+++ b/dev-python/fexpect/fexpect-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fexpect/fexpect-0.2.ebuild,v 1.2 2015/03/06 22:19:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fexpect/fexpect-0.2.ebuild,v 1.3 2015/03/08 23:47:23 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ilogue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
index eeae1f360d34..790ab95809d3 100644
--- a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
+++ b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/figleaf/figleaf-0.6.1-r1.ebuild,v 1.2 2015/03/06 22:19:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/figleaf/figleaf-0.6.1-r1.ebuild,v 1.3 2015/03/08 23:47:27 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://darcs.idyll.org/~t/projects/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fixtures/fixtures-0.3.14-r2.ebuild b/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
index 4f3ebbffcf6e..90f6283340f9 100644
--- a/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r2.ebuild,v 1.10 2015/03/07 08:27:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r2.ebuild,v 1.11 2015/03/09 00:04:21 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # nose not listed but provides coverage output of tests
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index b0da87ed2595..2b53c1157436 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,3 +1,2 @@
-DIST flake8-2.0.tar.gz 10511 SHA256 8dce4f7e64cc202cc6da93eab84b2ce660110ff684b6738bba64a0a431b3bc69 SHA512 6e3d8030562c4489dce8d4b17464ea8c0239b7c28fcefb7c67bff645e18628bc3074ff0ff197ab54228544d0ff85c2ff9509502c8f98371d8dc5df6f1e3ec047 WHIRLPOOL 46dabf0120b97cf20b58d76745dd0c23aec69f4eeb25b8605944c7ca4f8a05580c6c9df3ce7ec4e507f2402ddb53da2a6730cf6b246eec8472562ec33fcbb9e2
-DIST flake8-2.1.0.tar.gz 25010 SHA256 098ab7991067c08cfaa4716de20066d90f66dbc71502114ea8cad9a9fd5c9512 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b WHIRLPOOL 48982d33cd32f557796ef103da441f46d3a6ddbf1d1cace66f3ceac8b31bf78389c72df4a717881fe3735f6301b8ce0831908d32010f94ce72fc5414404261d4
 DIST flake8-2.2.5.tar.gz 28333 SHA256 285e8bd730c0b6fdfbe23c32d2936bffba401f23cab132e8722c68be80d6f182 SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee WHIRLPOOL 6c1e737a760876d410fd116bf2b8104f932b6751b5970096ddadcead5937fba21772fb28c1addf8026eda5ec573eb07cd920e46fb711d79f46de559d229c8705
+DIST flake8-2.4.0.tar.gz 67257 SHA256 d26a9d0252da9f831b8277b824961bb10b1f9d79f4752d32e4814b7bcd1e089b SHA512 fda9b8478550cc1b3cb05a0de0c8a008a41e8842c8d27268baa3114abb7358445267bb114942a155b089582314fe952f0714e34d738c054ab8bf46869a2c1b98 WHIRLPOOL f8a516f0d6cabe67484afd0393f0ca13b9cb9e89f28304ea1ea01aaab4b7ccf5d332cdefcf209eb7847e0616c72fe3d152f6f280029d45dbacd7f4d067d92b0f
diff --git a/dev-python/flake8/flake8-2.0-r1.ebuild b/dev-python/flake8/flake8-2.0-r1.ebuild
deleted file mode 100644
index f7c8841ff247..000000000000
--- a/dev-python/flake8/flake8-2.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0-r1.ebuild,v 1.4 2015/03/07 08:28:21 pacho Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="the modular source code checker: pep8, pyflakes and co"
-HOMEPAGE="http://bitbucket.org/tarek/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	>=dev-python/pyflakes-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.2[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	esetup.py test || die "Tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-2.0.ebuild b/dev-python/flake8/flake8-2.0.ebuild
deleted file mode 100644
index bb6407923de9..000000000000
--- a/dev-python/flake8/flake8-2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0.ebuild,v 1.11 2014/08/20 20:30:48 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="http://bitbucket.org/tarek/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/mccabe[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND} )"
-
-python_test() {
-	esetup.py test || die "tests failed"
-}
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.4.0.ebuild
similarity index 66%
rename from dev-python/flake8/flake8-2.1.0.ebuild
rename to dev-python/flake8/flake8-2.4.0.ebuild
index 8ec7c3bcf041..c166ffb9b195 100644
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ b/dev-python/flake8/flake8-2.4.0.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.1.0.ebuild,v 1.10 2014/11/03 11:20:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.4.0.ebuild,v 1.1 2015/03/09 18:53:13 xarthisius Exp $
 
 EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 
 DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="http://bitbucket.org/tarek/flake8"
+HOMEPAGE="http://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.6[${PYTHON_USEDEP}]"
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]"
 PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-admin/flask-admin-1.0.6.ebuild b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
index cc4c7444a9d9..f065c3a82b71 100644
--- a/dev-python/flask-admin/flask-admin-1.0.6.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-admin/flask-admin-1.0.6.ebuild,v 1.3 2015/03/06 22:19:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-admin/flask-admin-1.0.6.ebuild,v 1.4 2015/03/08 23:47:31 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild b/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
index 4cddf1800aa8..ce3ae45450c0 100644
--- a/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
+++ b/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild,v 1.2 2015/03/06 22:20:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild,v 1.3 2015/03/08 23:47:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
index 1b330b07459a..b12b390576b2 100644
--- a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
+++ b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild,v 1.2 2015/03/06 22:20:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild,v 1.3 2015/03/08 23:47:40 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild b/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild
index ce11757fa341..9b6ef5e1997d 100644
--- a/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild,v 1.2 2015/03/06 22:20:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild,v 1.3 2015/03/08 23:47:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-openid/flask-openid-1.2.4.ebuild b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
index 67fb90dfb7a7..257f917b7126 100644
--- a/dev-python/flask-openid/flask-openid-1.2.4.ebuild
+++ b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-openid/flask-openid-1.2.4.ebuild,v 1.2 2015/03/06 22:20:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-openid/flask-openid-1.2.4.ebuild,v 1.3 2015/03/08 23:47:48 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
index 0bb4b917eaf2..7953ba1e60dd 100644
--- a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
+++ b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild,v 1.3 2015/03/06 22:20:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild,v 1.4 2015/03/08 23:47:52 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 RESTRICT="test"
 
diff --git a/dev-python/flask-restful/flask-restful-0.2.12.ebuild b/dev-python/flask-restful/flask-restful-0.2.12.ebuild
index 0085e79f63ee..5290b17e4072 100644
--- a/dev-python/flask-restful/flask-restful-0.2.12.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restful/flask-restful-0.2.12.ebuild,v 1.3 2015/03/06 22:20:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restful/flask-restful-0.2.12.ebuild,v 1.4 2015/03/08 23:47:56 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples paging test"
 
 RDEPEND="
diff --git a/dev-python/flask-restless/flask-restless-0.15.0.ebuild b/dev-python/flask-restless/flask-restless-0.15.0.ebuild
index 4a05fdff86c6..3e5d87e0ea88 100644
--- a/dev-python/flask-restless/flask-restless-0.15.0.ebuild
+++ b/dev-python/flask-restless/flask-restless-0.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/flask-restless-0.15.0.ebuild,v 1.2 2015/03/06 22:20:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/flask-restless-0.15.0.ebuild,v 1.3 2015/03/08 23:48:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( AGPL-3 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc examples test"
 
diff --git a/dev-python/flask-script/flask-script-2.0.5.ebuild b/dev-python/flask-script/flask-script-2.0.5.ebuild
index 70f67f6b9caa..51af4d2ed065 100644
--- a/dev-python/flask-script/flask-script-2.0.5.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-script/flask-script-2.0.5.ebuild,v 1.5 2015/03/06 22:20:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-script/flask-script-2.0.5.ebuild,v 1.6 2015/03/08 23:48:06 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
index def4b909329c..e926d306ef73 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild,v 1.7 2015/03/06 22:20:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild,v 1.8 2015/03/08 23:48:10 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/flask-0.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.56.ebuild b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.56.ebuild
index 82539eb5ae3b..a1082c8b2609 100644
--- a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.56.ebuild
+++ b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.56.ebuild,v 1.2 2015/03/06 22:20:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.56.ebuild,v 1.3 2015/03/08 23:48:14 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
index cf0d80eac925..4049c32ae20c 100644
--- a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
+++ b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild,v 1.4 2015/03/06 22:20:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild,v 1.5 2015/03/08 23:48:18 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
index a0173178d88b..7b7f4a624969 100644
--- a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild,v 1.3 2015/03/06 22:21:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild,v 1.4 2015/03/08 23:48:23 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/fudge/fudge-1.0.3-r2.ebuild b/dev-python/fudge/fudge-1.0.3-r2.ebuild
index d81b7a800cc5..8fde45165f98 100644
--- a/dev-python/fudge/fudge-1.0.3-r2.ebuild
+++ b/dev-python/fudge/fudge-1.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-1.0.3-r2.ebuild,v 1.6 2015/03/06 22:21:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-1.0.3-r2.ebuild,v 1.7 2015/03/08 23:48:27 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
index d73b96006364..c06b1da1924a 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild,v 1.5 2015/03/06 22:21:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild,v 1.6 2015/03/08 23:48:31 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
index e5f08e6705b6..c3e44df4e0b0 100644
--- a/dev-python/funcsigs/funcsigs-0.4.ebuild
+++ b/dev-python/funcsigs/funcsigs-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/funcsigs/funcsigs-0.4.ebuild,v 1.4 2015/03/06 22:21:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/funcsigs/funcsigs-0.4.ebuild,v 1.5 2015/03/08 23:48:35 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/functest/functest-0.8.8-r1.ebuild b/dev-python/functest/functest-0.8.8-r1.ebuild
index 308857fa5b61..9fa91144ef13 100644
--- a/dev-python/functest/functest-0.8.8-r1.ebuild
+++ b/dev-python/functest/functest-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/functest/functest-0.8.8-r1.ebuild,v 1.2 2015/03/06 22:21:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/functest/functest-0.8.8-r1.ebuild,v 1.3 2015/03/08 23:48:39 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fusil/fusil-1.5.ebuild b/dev-python/fusil/fusil-1.5.ebuild
index 5f91f2f5665e..4b951e974299 100644
--- a/dev-python/fusil/fusil-1.5.ebuild
+++ b/dev-python/fusil/fusil-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/fusil-1.5.ebuild,v 1.5 2015/03/06 22:21:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/fusil-1.5.ebuild,v 1.6 2015/03/08 23:48:43 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
diff --git a/dev-python/futures/futures-2.2.0.ebuild b/dev-python/futures/futures-2.2.0.ebuild
index 34eb7c21e495..e51fa0d1e81e 100644
--- a/dev-python/futures/futures-2.2.0.ebuild
+++ b/dev-python/futures/futures-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.2.0.ebuild,v 1.3 2015/03/06 22:21:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.2.0.ebuild,v 1.4 2015/03/08 23:48:47 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/g-pypi/g-pypi-0.3.ebuild b/dev-python/g-pypi/g-pypi-0.3.ebuild
index cbc35426513d..3fe87c3e9a2b 100644
--- a/dev-python/g-pypi/g-pypi-0.3.ebuild
+++ b/dev-python/g-pypi/g-pypi-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/g-pypi/g-pypi-0.3.ebuild,v 1.8 2015/03/06 22:21:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/g-pypi/g-pypi-0.3.ebuild,v 1.9 2015/03/08 23:48:52 pacho Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/iElectric/g-pypi"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
index 589128ee1990..4c8bf391d925 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild,v 1.2 2015/03/06 22:21:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild,v 1.3 2015/03/08 23:48:56 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-python/geopy/geopy-1.8.1.ebuild b/dev-python/geopy/geopy-1.8.1.ebuild
index 8832a309199f..6548a01b848c 100644
--- a/dev-python/geopy/geopy-1.8.1.ebuild
+++ b/dev-python/geopy/geopy-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-1.8.1.ebuild,v 1.2 2015/03/06 22:21:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-1.8.1.ebuild,v 1.3 2015/03/08 23:49:01 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ IUSE="test doc yahoo"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
 		dev-python/placefinder[${PYTHON_USEDEP}] )"
diff --git a/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild b/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
index edfb20cad0fe..ab0b71bcbf44 100644
--- a/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
+++ b/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild,v 1.2 2015/03/06 22:22:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild,v 1.3 2015/03/08 23:49:05 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/gevent-websocket[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
index a2b4f433f4b5..4d57bedf81fe 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild,v 1.2 2015/03/06 22:22:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild,v 1.3 2015/03/08 23:49:09 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent-zeromq/gevent-zeromq-0.2.5-r1.ebuild b/dev-python/gevent-zeromq/gevent-zeromq-0.2.5-r1.ebuild
index b4d52da31e86..6207627aa321 100644
--- a/dev-python/gevent-zeromq/gevent-zeromq-0.2.5-r1.ebuild
+++ b/dev-python/gevent-zeromq/gevent-zeromq-0.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-zeromq/gevent-zeromq-0.2.5-r1.ebuild,v 1.3 2015/03/06 22:22:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-zeromq/gevent-zeromq-0.2.5-r1.ebuild,v 1.4 2015/03/08 23:49:13 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="~dev-python/pyzmq-2.2.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/git-python/git-python-0.3.6.ebuild b/dev-python/git-python/git-python-0.3.6.ebuild
index ee016906f46e..547b54ad98b2 100644
--- a/dev-python/git-python/git-python-0.3.6.ebuild
+++ b/dev-python/git-python/git-python-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/git-python/git-python-0.3.6.ebuild,v 1.2 2015/03/06 22:22:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/git-python/git-python-0.3.6.ebuild,v 1.3 2015/03/08 23:49:17 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # Tests dont make sense without a git repo
diff --git a/dev-python/gitdb/gitdb-0.6.4.ebuild b/dev-python/gitdb/gitdb-0.6.4.ebuild
index 44826f2de30a..e7b00b022160 100644
--- a/dev-python/gitdb/gitdb-0.6.4.ebuild
+++ b/dev-python/gitdb/gitdb-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gitdb/gitdb-0.6.4.ebuild,v 1.2 2015/03/06 22:22:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gitdb/gitdb-0.6.4.ebuild,v 1.3 2015/03/08 23:49:21 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-vcs/git
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
index ca3dd9329748..fb54538f65bf 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild,v 1.4 2015/03/06 22:44:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild,v 1.5 2015/03/09 00:03:57 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/google-apputils/google-apputils-0.4.0.ebuild b/dev-python/google-apputils/google-apputils-0.4.0.ebuild
index b2a77c9e60ae..5ca88ed95a69 100644
--- a/dev-python/google-apputils/google-apputils-0.4.0.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/google-apputils/google-apputils-0.4.0.ebuild,v 1.4 2015/03/06 22:22:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/google-apputils/google-apputils-0.4.0.ebuild,v 1.5 2015/03/08 23:49:25 pacho Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://google-apputils-python.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild b/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild
index c9cf76da9d05..cc70161c846d 100644
--- a/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild,v 1.3 2015/03/06 22:22:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.36-r1.ebuild,v 1.4 2015/03/08 23:49:29 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
diff --git a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
index e27423c9d270..2a3a26031cb9 100644
--- a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
+++ b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild,v 1.3 2015/03/06 22:22:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild,v 1.4 2015/03/08 23:49:34 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="dev-python/networkx[${PYTHON_USEDEP}]
diff --git a/dev-python/graphy/graphy-1.0-r1.ebuild b/dev-python/graphy/graphy-1.0-r1.ebuild
index fd08e3be81a5..21f2a57ceb7e 100644
--- a/dev-python/graphy/graphy-1.0-r1.ebuild
+++ b/dev-python/graphy/graphy-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graphy/graphy-1.0-r1.ebuild,v 1.5 2015/03/07 08:16:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graphy/graphy-1.0-r1.ebuild,v 1.6 2015/03/08 23:49:38 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/guppy/guppy-0.1.10-r1.ebuild b/dev-python/guppy/guppy-0.1.10-r1.ebuild
index 6f7c26a8afd1..b21f6aaeb34d 100644
--- a/dev-python/guppy/guppy-0.1.10-r1.ebuild
+++ b/dev-python/guppy/guppy-0.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/guppy-0.1.10-r1.ebuild,v 1.3 2015/03/06 22:23:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/guppy-0.1.10-r1.ebuild,v 1.4 2015/03/08 23:49:42 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND=""
diff --git a/dev-python/h5py/h5py-2.3.1.ebuild b/dev-python/h5py/h5py-2.3.1.ebuild
index 78276720c4e9..479638702664 100644
--- a/dev-python/h5py/h5py-2.3.1.ebuild
+++ b/dev-python/h5py/h5py-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.3.1.ebuild,v 1.7 2015/03/06 22:23:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.3.1.ebuild,v 1.8 2015/03/08 23:49:46 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test examples mpi"
 
 RDEPEND="
diff --git a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
index efd6e2b48214..254f01a4b191 100644
--- a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
+++ b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild,v 1.4 2015/03/07 08:17:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild,v 1.5 2015/03/08 23:49:50 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
index 2197876ca80d..9794a1e173c9 100644
--- a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
+++ b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild,v 1.3 2015/03/07 08:17:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild,v 1.4 2015/03/08 23:49:54 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
index 202121e7b51f..12b5303f976b 100644
--- a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
+++ b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild,v 1.3 2015/03/07 08:17:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild,v 1.4 2015/03/08 23:49:58 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hacking/hacking-0.10.1.ebuild b/dev-python/hacking/hacking-0.10.1.ebuild
index 046aeff4a425..cb9e1fd5b387 100644
--- a/dev-python/hacking/hacking-0.10.1.ebuild
+++ b/dev-python/hacking/hacking-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.10.1.ebuild,v 1.2 2015/03/06 22:23:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.10.1.ebuild,v 1.3 2015/03/08 23:50:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/hacking/hacking-0.8.1.ebuild b/dev-python/hacking/hacking-0.8.1.ebuild
index eda17cb43f76..135fcf5db7e6 100644
--- a/dev-python/hacking/hacking-0.8.1.ebuild
+++ b/dev-python/hacking/hacking-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.8.1.ebuild,v 1.2 2015/03/06 22:23:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.8.1.ebuild,v 1.3 2015/03/08 23:50:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/hacking/hacking-0.9.2.ebuild b/dev-python/hacking/hacking-0.9.2.ebuild
index 27caee550ab6..3d016ff03062 100644
--- a/dev-python/hacking/hacking-0.9.2.ebuild
+++ b/dev-python/hacking/hacking-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.9.2.ebuild,v 1.3 2015/03/06 22:23:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.9.2.ebuild,v 1.4 2015/03/08 23:50:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
diff --git a/dev-python/happydoc/happydoc-3.1-r2.ebuild b/dev-python/happydoc/happydoc-3.1-r2.ebuild
index cee9a6c81efe..5d51a6255ea5 100644
--- a/dev-python/happydoc/happydoc-3.1-r2.ebuild
+++ b/dev-python/happydoc/happydoc-3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-3.1-r2.ebuild,v 1.5 2015/03/07 08:17:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-3.1-r2.ebuild,v 1.6 2015/03/08 23:50:07 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_r${MY_PV}.tar.gz"
 
 LICENSE="HPND ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hcs-utils/hcs-utils-1.5.ebuild b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
index d6a2c776b07c..146b8d881766 100644
--- a/dev-python/hcs-utils/hcs-utils-1.5.ebuild
+++ b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.5.ebuild,v 1.2 2015/03/06 22:23:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.5.ebuild,v 1.3 2015/03/08 23:50:11 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/hgtools/hgtools-6.0.ebuild b/dev-python/hgtools/hgtools-6.0.ebuild
index 869d01f9f7fa..3096541776be 100644
--- a/dev-python/hgtools/hgtools-6.0.ebuild
+++ b/dev-python/hgtools/hgtools-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-6.0.ebuild,v 1.2 2015/03/06 22:23:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-6.0.ebuild,v 1.3 2015/03/08 23:50:15 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
 SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-python/hiredis/hiredis-0.1.1-r2.ebuild b/dev-python/hiredis/hiredis-0.1.1-r2.ebuild
index 9de0973f885a..0b5d4190ea22 100644
--- a/dev-python/hiredis/hiredis-0.1.1-r2.ebuild
+++ b/dev-python/hiredis/hiredis-0.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hiredis/hiredis-0.1.1-r2.ebuild,v 1.5 2015/03/06 22:24:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hiredis/hiredis-0.1.1-r2.ebuild,v 1.6 2015/03/08 23:50:20 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="dev-libs/hiredis"
diff --git a/dev-python/http-parser/http-parser-0.8.3.ebuild b/dev-python/http-parser/http-parser-0.8.3.ebuild
index d603bcfde3d8..2d410f3e6993 100644
--- a/dev-python/http-parser/http-parser-0.8.3.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/http-parser/http-parser-0.8.3.ebuild,v 1.10 2015/03/07 08:17:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/http-parser/http-parser-0.8.3.ebuild,v 1.11 2015/03/08 23:50:24 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/httpretty/httpretty-0.8.0.ebuild b/dev-python/httpretty/httpretty-0.8.0.ebuild
index 83d34e09a1c3..d9644782b998 100644
--- a/dev-python/httpretty/httpretty-0.8.0.ebuild
+++ b/dev-python/httpretty/httpretty-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httpretty/httpretty-0.8.0.ebuild,v 1.4 2015/03/06 22:44:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httpretty/httpretty-0.8.0.ebuild,v 1.5 2015/03/09 00:03:52 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
@@ -11,7 +11,7 @@ DESCRIPTION="HTTP client mock for Python"
 HOMEPAGE="http://github.com/gabrielfalcao/httpretty"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild b/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
index 6df135b50055..baccf4fc6f33 100644
--- a/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
+++ b/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild,v 1.3 2015/03/06 22:24:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild,v 1.4 2015/03/08 23:50:28 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/cjkpython/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/ijson/ijson-2.0.ebuild b/dev-python/ijson/ijson-2.0.ebuild
index 9bf45cf7fa1e..bf126e3281fe 100644
--- a/dev-python/ijson/ijson-2.0.ebuild
+++ b/dev-python/ijson/ijson-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ijson/ijson-2.0.ebuild,v 1.3 2015/03/06 22:24:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ijson/ijson-2.0.ebuild,v 1.4 2015/03/08 23:50:32 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/yajl"
 DEPEND="${RDEPEND}
diff --git a/dev-python/imaging/imaging-1.1.7-r5.ebuild b/dev-python/imaging/imaging-1.1.7-r5.ebuild
index fb1fdd2dda0d..eb36960f53b2 100644
--- a/dev-python/imaging/imaging-1.1.7-r5.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 1.6 2015/03/07 08:17:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 1.7 2015/03/08 23:50:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg scanner test tiff tk truetype zlib"
 
 RDEPEND="
diff --git a/dev-python/imapclient/imapclient-0.12.ebuild b/dev-python/imapclient/imapclient-0.12.ebuild
index b5d3a341186b..6ea5aa38a5b9 100644
--- a/dev-python/imapclient/imapclient-0.12.ebuild
+++ b/dev-python/imapclient/imapclient-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imapclient/imapclient-0.12.ebuild,v 1.2 2015/03/06 22:24:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imapclient/imapclient-0.12.ebuild,v 1.3 2015/03/08 23:50:41 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/importing/importing-1.10.ebuild b/dev-python/importing/importing-1.10.ebuild
index 1626ead23c2e..bd919da2f73f 100644
--- a/dev-python/importing/importing-1.10.ebuild
+++ b/dev-python/importing/importing-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/importing/importing-1.10.ebuild,v 1.4 2015/03/06 22:24:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/importing/importing-1.10.ebuild,v 1.5 2015/03/08 23:50:45 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ DESCRIPTION="Import objects dynamically, lazily, "weakly", and more"
 HOMEPAGE=" http://peak.telecommunity.com/DevCenter/Importing"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/into/into-0.1.3.ebuild b/dev-python/into/into-0.1.3.ebuild
index c731b2a5cb49..6cb4ce5754a3 100644
--- a/dev-python/into/into-0.1.3.ebuild
+++ b/dev-python/into/into-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.1.3.ebuild,v 1.2 2015/03/06 22:24:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.1.3.ebuild,v 1.3 2015/03/08 23:50:49 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-python/ioflo/ioflo-1.0.2.ebuild b/dev-python/ioflo/ioflo-1.0.2.ebuild
index e32d20df00a5..de1af7185349 100644
--- a/dev-python/ioflo/ioflo-1.0.2.ebuild
+++ b/dev-python/ioflo/ioflo-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ioflo/ioflo-1.0.2.ebuild,v 1.2 2015/03/06 22:24:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ioflo/ioflo-1.0.2.ebuild,v 1.3 2015/03/08 23:50:53 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipcalc/ipcalc-1.1.3.ebuild b/dev-python/ipcalc/ipcalc-1.1.3.ebuild
index d1b773f6ddaf..8910a07b5a26 100644
--- a/dev-python/ipcalc/ipcalc-1.1.3.ebuild
+++ b/dev-python/ipcalc/ipcalc-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipcalc/ipcalc-1.1.3.ebuild,v 1.2 2015/03/06 22:24:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipcalc/ipcalc-1.1.3.ebuild,v 1.3 2015/03/08 23:50:57 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/ipdb/ipdb-0.8.ebuild b/dev-python/ipdb/ipdb-0.8.ebuild
index c0d02f7f2ba1..fb05d083c582 100644
--- a/dev-python/ipdb/ipdb-0.8.ebuild
+++ b/dev-python/ipdb/ipdb-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipdb/ipdb-0.8.ebuild,v 1.3 2015/03/06 22:25:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipdb/ipdb-0.8.ebuild,v 1.4 2015/03/08 23:51:01 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipython/ipython-2.2.0.ebuild b/dev-python/ipython/ipython-2.2.0.ebuild
index 15e74493fd04..562ad2d5d493 100644
--- a/dev-python/ipython/ipython-2.2.0.ebuild
+++ b/dev-python/ipython/ipython-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.2.0.ebuild,v 1.8 2015/03/07 08:17:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.2.0.ebuild,v 1.9 2015/03/08 23:51:07 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
 
diff --git a/dev-python/irc/irc-11.0.1.ebuild b/dev-python/irc/irc-11.0.1.ebuild
index 7f3eb7df1a6e..28cd02433432 100644
--- a/dev-python/irc/irc-11.0.1.ebuild
+++ b/dev-python/irc/irc-11.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-11.0.1.ebuild,v 1.2 2015/03/06 22:25:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-11.0.1.ebuild,v 1.3 2015/03/08 23:51:11 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/irman-python/irman-python-0.1-r1.ebuild b/dev-python/irman-python/irman-python-0.1-r1.ebuild
index 0fc23d751811..7abc2c3c6c05 100644
--- a/dev-python/irman-python/irman-python-0.1-r1.ebuild
+++ b/dev-python/irman-python/irman-python-0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irman-python/irman-python-0.1-r1.ebuild,v 1.4 2015/03/06 22:25:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irman-python/irman-python-0.1-r1.ebuild,v 1.5 2015/03/08 23:51:15 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://bluweb.com/chouser/proj/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/libirman"
diff --git a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
index 034e387ee1ba..66cfb105c5cd 100644
--- a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
+++ b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild,v 1.4 2015/03/06 22:25:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild,v 1.5 2015/03/08 23:51:19 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/hgtools[${PYTHON_USEDEP}]
diff --git a/dev-python/jingo/jingo-0.7.ebuild b/dev-python/jingo/jingo-0.7.ebuild
index adf29d6bfcac..c0d6f2b5ab37 100644
--- a/dev-python/jingo/jingo-0.7.ebuild
+++ b/dev-python/jingo/jingo-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jingo/jingo-0.7.ebuild,v 1.2 2015/03/06 22:25:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jingo/jingo-0.7.ebuild,v 1.3 2015/03/08 23:51:23 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/joblib/joblib-0.8.4.ebuild b/dev-python/joblib/joblib-0.8.4.ebuild
index d780e36962fe..d44ffb2fae46 100644
--- a/dev-python/joblib/joblib-0.8.4.ebuild
+++ b/dev-python/joblib/joblib-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/joblib/joblib-0.8.4.ebuild,v 1.2 2015/03/06 22:26:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/joblib/joblib-0.8.4.ebuild,v 1.3 2015/03/08 23:51:27 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jonpy/jonpy-0.11.ebuild b/dev-python/jonpy/jonpy-0.11.ebuild
index e3df952c709d..6cccb1fd41cd 100644
--- a/dev-python/jonpy/jonpy-0.11.ebuild
+++ b/dev-python/jonpy/jonpy-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/jonpy-0.11.ebuild,v 1.3 2015/03/06 22:26:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/jonpy-0.11.ebuild,v 1.4 2015/03/08 23:51:32 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 python_install_all() {
diff --git a/dev-python/jsmin/jsmin-2.0.9.ebuild b/dev-python/jsmin/jsmin-2.0.9.ebuild
index 87074da7c9d9..4a5487d30f31 100644
--- a/dev-python/jsmin/jsmin-2.0.9.ebuild
+++ b/dev-python/jsmin/jsmin-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/jsmin-2.0.9.ebuild,v 1.2 2015/03/06 22:26:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/jsmin-2.0.9.ebuild,v 1.3 2015/03/08 23:51:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -11,7 +11,7 @@ DESCRIPTION="JavaScript minifier"
 HOMEPAGE="https://bitbucket.org/dcs/jsmin/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/json-tools/json-tools-0.3.3.ebuild b/dev-python/json-tools/json-tools-0.3.3.ebuild
index b7dd545a0fe6..b6dd37324496 100644
--- a/dev-python/json-tools/json-tools-0.3.3.ebuild
+++ b/dev-python/json-tools/json-tools-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/json-tools/json-tools-0.3.3.ebuild,v 1.2 2015/03/06 22:26:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/json-tools/json-tools-0.3.3.ebuild,v 1.3 2015/03/08 23:51:40 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpatch/jsonpatch-1.9.ebuild b/dev-python/jsonpatch/jsonpatch-1.9.ebuild
index 47d006bbd667..f24ee48d54ab 100644
--- a/dev-python/jsonpatch/jsonpatch-1.9.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpatch/jsonpatch-1.9.ebuild,v 1.2 2015/03/06 22:26:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpatch/jsonpatch-1.9.ebuild,v 1.3 2015/03/08 23:51:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsonpickle/jsonpickle-0.8.0.ebuild b/dev-python/jsonpickle/jsonpickle-0.8.0.ebuild
index d4fbbd472f49..3c9d168d3667 100644
--- a/dev-python/jsonpickle/jsonpickle-0.8.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.8.0.ebuild,v 1.2 2015/03/06 22:26:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.8.0.ebuild,v 1.3 2015/03/08 23:51:48 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # There are optional json backends in addition to those selected here
diff --git a/dev-python/jsonpointer/jsonpointer-1.7.ebuild b/dev-python/jsonpointer/jsonpointer-1.7.ebuild
index ca45eb75e4df..612b9536e1ce 100644
--- a/dev-python/jsonpointer/jsonpointer-1.7.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpointer/jsonpointer-1.7.ebuild,v 1.2 2015/03/06 22:26:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpointer/jsonpointer-1.7.ebuild,v 1.3 2015/03/08 23:51:53 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
index f3b3ca4a653d..ca12ae8f0737 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild,v 1.3 2015/03/06 22:26:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild,v 1.4 2015/03/08 23:51:57 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild b/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild
index af84324f44af..99c82916f913 100644
--- a/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild
+++ b/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild,v 1.3 2015/03/07 08:17:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild,v 1.4 2015/03/08 23:52:01 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="css dvd"
 
 DEPEND=">=dev-python/kaa-base-0.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kazoo/kazoo-2.0.ebuild b/dev-python/kazoo/kazoo-2.0.ebuild
index 2da7588c7b74..0c82515d1a73 100644
--- a/dev-python/kazoo/kazoo-2.0.ebuild
+++ b/dev-python/kazoo/kazoo-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kazoo/kazoo-2.0.ebuild,v 1.2 2015/03/06 22:27:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kazoo/kazoo-2.0.ebuild,v 1.3 2015/03/08 23:52:05 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gevent test"
 
 RDEPEND="
diff --git a/dev-python/keyczar/keyczar-0.715.ebuild b/dev-python/keyczar/keyczar-0.715.ebuild
index 06d153658d2d..cd442a3a2d01 100644
--- a/dev-python/keyczar/keyczar-0.715.ebuild
+++ b/dev-python/keyczar/keyczar-0.715.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyczar/keyczar-0.715.ebuild,v 1.2 2015/03/06 22:27:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyczar/keyczar-0.715.ebuild,v 1.3 2015/03/08 23:52:09 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )	#appears py2 friendly only
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/kid/kid-0.9.6-r1.ebuild b/dev-python/kid/kid-0.9.6-r1.ebuild
index db029d5411ce..b30b78edfc82 100644
--- a/dev-python/kid/kid-0.9.6-r1.ebuild
+++ b/dev-python/kid/kid-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/kid-0.9.6-r1.ebuild,v 1.4 2015/03/06 22:27:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/kid-0.9.6-r1.ebuild,v 1.5 2015/03/08 23:52:13 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND=""
diff --git a/dev-python/kombu/kombu-3.0.24.ebuild b/dev-python/kombu/kombu-3.0.24.ebuild
index f536233d575e..ebdec12266b4 100644
--- a/dev-python/kombu/kombu-3.0.24.ebuild
+++ b/dev-python/kombu/kombu-3.0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.24.ebuild,v 1.2 2015/03/06 22:27:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-3.0.24.ebuild,v 1.3 2015/03/08 23:52:17 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="amqplib doc examples msgpack sqs test"
 
 PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
diff --git a/dev-python/lesscpy/lesscpy-0.9j.ebuild b/dev-python/lesscpy/lesscpy-0.9j.ebuild
index 6864b9b58342..b8bdaa0844a0 100644
--- a/dev-python/lesscpy/lesscpy-0.9j.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.9j.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lesscpy/lesscpy-0.9j.ebuild,v 1.3 2015/03/06 22:27:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lesscpy/lesscpy-0.9j.ebuild,v 1.4 2015/03/08 23:52:22 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/libcloud/libcloud-0.15.1.ebuild b/dev-python/libcloud/libcloud-0.15.1.ebuild
index c685b14ea0d6..090f68627881 100644
--- a/dev-python/libcloud/libcloud-0.15.1.ebuild
+++ b/dev-python/libcloud/libcloud-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/libcloud/libcloud-0.15.1.ebuild,v 1.3 2015/03/06 22:27:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libcloud/libcloud-0.15.1.ebuild,v 1.4 2015/03/08 23:52:26 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 RDEPEND=""
diff --git a/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild b/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
index 67b9c73711d8..4056fe18a043 100644
--- a/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
+++ b/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild,v 1.5 2015/03/07 08:18:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild,v 1.6 2015/03/08 23:52:30 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/libextractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libextractor-0.6.3"
diff --git a/dev-python/libnacl/libnacl-1.4.0.ebuild b/dev-python/libnacl/libnacl-1.4.0.ebuild
index ef888bffa8d9..19368ffa0513 100644
--- a/dev-python/libnacl/libnacl-1.4.0.ebuild
+++ b/dev-python/libnacl/libnacl-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/libnacl/libnacl-1.4.0.ebuild,v 1.3 2015/03/06 22:27:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libnacl/libnacl-1.4.0.ebuild,v 1.4 2015/03/08 23:52:34 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_7,3_4})
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/librharris/librharris-0.1.14-r1.ebuild b/dev-python/librharris/librharris-0.1.14-r1.ebuild
index 225fa0211e5a..9c0112083f11 100644
--- a/dev-python/librharris/librharris-0.1.14-r1.ebuild
+++ b/dev-python/librharris/librharris-0.1.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/librharris/librharris-0.1.14-r1.ebuild,v 1.2 2015/03/06 22:28:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/librharris/librharris-0.1.14-r1.ebuild,v 1.3 2015/03/08 23:52:38 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/llfuse/llfuse-0.40.ebuild b/dev-python/llfuse/llfuse-0.40.ebuild
index f0e5dfd07148..dcc14bcef7df 100644
--- a/dev-python/llfuse/llfuse-0.40.ebuild
+++ b/dev-python/llfuse/llfuse-0.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/llfuse/llfuse-0.40.ebuild,v 1.4 2015/03/06 22:28:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/llfuse/llfuse-0.40.ebuild,v 1.5 2015/03/08 23:52:42 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -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"
 
 RDEPEND=">=sys-fs/fuse-2.8.0"
diff --git a/dev-python/llvmlite/llvmlite-0.2.1.ebuild b/dev-python/llvmlite/llvmlite-0.2.1.ebuild
index d19b616681a5..776a72b65043 100644
--- a/dev-python/llvmlite/llvmlite-0.2.1.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/llvmlite/llvmlite-0.2.1.ebuild,v 1.2 2015/03/06 22:28:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/llvmlite/llvmlite-0.2.1.ebuild,v 1.3 2015/03/08 23:52:46 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND=">=sys-devel/llvm-3.5:=[multitarget]"
diff --git a/dev-python/llvmpy/llvmpy-0.12.7.ebuild b/dev-python/llvmpy/llvmpy-0.12.7.ebuild
index a453af7de3ab..a4012d4296f0 100644
--- a/dev-python/llvmpy/llvmpy-0.12.7.ebuild
+++ b/dev-python/llvmpy/llvmpy-0.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/llvmpy/llvmpy-0.12.7.ebuild,v 1.2 2015/03/06 22:28:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/llvmpy/llvmpy-0.12.7.ebuild,v 1.3 2015/03/08 23:52:50 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # fails with llvm-3.4
diff --git a/dev-python/log4py/log4py-1.3-r1.ebuild b/dev-python/log4py/log4py-1.3-r1.ebuild
index b4665b14b606..99101dc59ee3 100644
--- a/dev-python/log4py/log4py-1.3-r1.ebuild
+++ b/dev-python/log4py/log4py-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/log4py/log4py-1.3-r1.ebuild,v 1.3 2015/03/07 08:18:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/log4py/log4py-1.3-r1.ebuild,v 1.4 2015/03/08 23:52:54 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://www.its4you.at/downloads/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND=""
diff --git a/dev-python/logilab-common/logilab-common-0.63.2.ebuild b/dev-python/logilab-common/logilab-common-0.63.2.ebuild
index ff8a62cc0780..e3751ef1f3e2 100644
--- a/dev-python/logilab-common/logilab-common-0.63.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.63.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.63.2.ebuild,v 1.4 2015/03/07 08:18:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.63.2.ebuild,v 1.5 2015/03/08 23:52:58 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
index 582b4200132a..e259e8cd25a9 100644
--- a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
+++ b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild,v 1.4 2015/03/06 22:28:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild,v 1.5 2015/03/08 23:53:03 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.logilab.org/pub/constraint/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="doc examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/lupy/lupy-0.2.1-r2.ebuild b/dev-python/lupy/lupy-0.2.1-r2.ebuild
index 9d7c17c07129..b2f6fbe6fc7f 100644
--- a/dev-python/lupy/lupy-0.2.1-r2.ebuild
+++ b/dev-python/lupy/lupy-0.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lupy/lupy-0.2.1-r2.ebuild,v 1.3 2015/03/07 08:18:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lupy/lupy-0.2.1-r2.ebuild,v 1.4 2015/03/08 23:53:07 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/lupy/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~s390 ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~s390 x86"
 IUSE="examples"
 
 DEPEND=""
diff --git a/dev-python/lxml/lxml-3.4.1.ebuild b/dev-python/lxml/lxml-3.4.1.ebuild
index f5582f1606d4..1648d5bbf5f7 100644
--- a/dev-python/lxml/lxml-3.4.1.ebuild
+++ b/dev-python/lxml/lxml-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.4.1.ebuild,v 1.6 2015/03/07 08:18:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.4.1.ebuild,v 1.7 2015/03/08 23:53:11 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="beautifulsoup3 doc examples +threads"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/lz4/lz4-0.6.1.ebuild b/dev-python/lz4/lz4-0.6.1.ebuild
index e52fac9e50f7..edb70dd31f7a 100644
--- a/dev-python/lz4/lz4-0.6.1.ebuild
+++ b/dev-python/lz4/lz4-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lz4/lz4-0.6.1.ebuild,v 1.4 2015/03/06 22:29:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lz4/lz4-0.6.1.ebuild,v 1.5 2015/03/08 23:53:16 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
index 7835eb371f53..7498dcc97759 100644
--- a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
+++ b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2secret/m2secret-0.1.1-r1.ebuild,v 1.3 2015/03/06 22:29:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2secret/m2secret-0.1.1-r1.ebuild,v 1.4 2015/03/08 23:53:20 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
index 56e5f89fef19..a36f6b62d43b 100644
--- a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
+++ b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mantissa/mantissa-0.7.0-r1.ebuild,v 1.2 2015/03/06 22:29:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mantissa/mantissa-0.7.0-r1.ebuild,v 1.3 2015/03/08 23:53:24 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -11,7 +11,7 @@ DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application
 HOMEPAGE="http://divmod.org/trac/wiki/DivmodMantissa http://pypi.python.org/pypi/Mantissa"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/axiom-0.6.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/manuel/manuel-1.7.1.ebuild b/dev-python/manuel/manuel-1.7.1.ebuild
index e867cade0e74..9a8cbca277b6 100644
--- a/dev-python/manuel/manuel-1.7.1.ebuild
+++ b/dev-python/manuel/manuel-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/manuel/manuel-1.7.1.ebuild,v 1.10 2015/03/06 22:29:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/manuel/manuel-1.7.1.ebuild,v 1.11 2015/03/08 23:53:28 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://dev.gentoo.org/~idella4/tarballs/${P}-20130316.tar.bz2"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/markdown2/markdown2-2.3.0.ebuild b/dev-python/markdown2/markdown2-2.3.0.ebuild
index bfb76b7d6c43..5ff7d415f930 100644
--- a/dev-python/markdown2/markdown2-2.3.0.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown2/markdown2-2.3.0.ebuild,v 1.2 2015/03/06 22:29:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown2/markdown2-2.3.0.ebuild,v 1.3 2015/03/08 23:53:32 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/matplotlib-1.4.2.ebuild b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
index 7b7993f5322f..f64a1eb29ee0 100644
--- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v 1.10 2015/03/07 08:26:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v 1.11 2015/03/09 00:03:04 pacho Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="amd64 arm ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets"
 
 # #456704 -- a lot of py2-only deps
diff --git a/dev-python/meld3/meld3-1.0.0.ebuild b/dev-python/meld3/meld3-1.0.0.ebuild
index a7d24dbc38af..e34096bfc44f 100644
--- a/dev-python/meld3/meld3-1.0.0.ebuild
+++ b/dev-python/meld3/meld3-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-1.0.0.ebuild,v 1.4 2015/03/06 22:29:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-1.0.0.ebuild,v 1.5 2015/03/08 23:53:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mimerender/mimerender-0.5.5.ebuild b/dev-python/mimerender/mimerender-0.5.5.ebuild
index 9bb163fd6c94..f9cf2c7153fd 100644
--- a/dev-python/mimerender/mimerender-0.5.5.ebuild
+++ b/dev-python/mimerender/mimerender-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mimerender/mimerender-0.5.5.ebuild,v 1.2 2015/03/06 22:29:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mimerender/mimerender-0.5.5.ebuild,v 1.3 2015/03/08 23:53:40 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ HOMEPAGE="http://pypi.python.org/pypi/mimerender"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/mocker/mocker-1.1.1-r1.ebuild b/dev-python/mocker/mocker-1.1.1-r1.ebuild
index c1c3fe4f699f..0e8c4fd6325b 100644
--- a/dev-python/mocker/mocker-1.1.1-r1.ebuild
+++ b/dev-python/mocker/mocker-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mocker/mocker-1.1.1-r1.ebuild,v 1.6 2015/03/06 22:30:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mocker/mocker-1.1.1-r1.ebuild,v 1.7 2015/03/08 23:53:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild
index af46a78f7d85..823d87a60a56 100644
--- a/dev-python/mockldap/mockldap-0.2.3.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mockldap/mockldap-0.2.3.ebuild,v 1.2 2015/03/06 22:30:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mockldap/mockldap-0.2.3.ebuild,v 1.3 2015/03/08 23:53:48 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
diff --git a/dev-python/more-itertools/more-itertools-2.2.ebuild b/dev-python/more-itertools/more-itertools-2.2.ebuild
index 86e1b4c9526b..8f1732d48968 100644
--- a/dev-python/more-itertools/more-itertools-2.2.ebuild
+++ b/dev-python/more-itertools/more-itertools-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/more-itertools/more-itertools-2.2.ebuild,v 1.3 2015/03/06 22:30:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/more-itertools/more-itertools-2.2.ebuild,v 1.4 2015/03/08 23:53:52 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-python/mox3/mox3-0.7.0-r1.ebuild b/dev-python/mox3/mox3-0.7.0-r1.ebuild
index 1ef8b60c53de..7ac58ed0510e 100644
--- a/dev-python/mox3/mox3-0.7.0-r1.ebuild
+++ b/dev-python/mox3/mox3-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mox3/mox3-0.7.0-r1.ebuild,v 1.2 2015/03/06 22:45:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mox3/mox3-0.7.0-r1.ebuild,v 1.3 2015/03/09 00:04:31 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/msgpack/msgpack-0.4.5.ebuild b/dev-python/msgpack/msgpack-0.4.5.ebuild
index 27bc5c080e22..c04865a72868 100644
--- a/dev-python/msgpack/msgpack-0.4.5.ebuild
+++ b/dev-python/msgpack/msgpack-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.4.5.ebuild,v 1.2 2015/03/06 22:30:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.4.5.ebuild,v 1.3 2015/03/08 23:54:00 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/multipledispatch/multipledispatch-0.4.7.ebuild b/dev-python/multipledispatch/multipledispatch-0.4.7.ebuild
index 8e429f4c95d6..36979ac19bba 100644
--- a/dev-python/multipledispatch/multipledispatch-0.4.7.ebuild
+++ b/dev-python/multipledispatch/multipledispatch-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/multipledispatch/multipledispatch-0.4.7.ebuild,v 1.2 2015/03/06 22:30:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/multipledispatch/multipledispatch-0.4.7.ebuild,v 1.3 2015/03/08 23:54:04 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ HOMEPAGE="http://pypi.python.org/pypi/mimerender"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
index 98bc27edd74c..bb37d01d2684 100644
--- a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild,v 1.4 2015/03/06 22:30:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild,v 1.5 2015/03/08 23:54:08 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://thp.io/2010/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/simplejson"
diff --git a/dev-python/natsort/natsort-3.4.0.ebuild b/dev-python/natsort/natsort-3.4.0.ebuild
index 706d9d7b63ac..379bb149b1e3 100644
--- a/dev-python/natsort/natsort-3.4.0.ebuild
+++ b/dev-python/natsort/natsort-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/natsort/natsort-3.4.0.ebuild,v 1.2 2015/03/06 22:30:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/natsort/natsort-3.4.0.ebuild,v 1.3 2015/03/08 23:54:12 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/netaddr/netaddr-0.7.12.ebuild b/dev-python/netaddr/netaddr-0.7.12.ebuild
index a66dbb06c76e..41d31756eeb4 100644
--- a/dev-python/netaddr/netaddr-0.7.12.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/netaddr-0.7.12.ebuild,v 1.4 2015/03/06 22:43:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/netaddr-0.7.12.ebuild,v 1.5 2015/03/09 00:03:08 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cli"
 
 DEPEND=""
diff --git a/dev-python/netifaces/netifaces-0.10.4.ebuild b/dev-python/netifaces/netifaces-0.10.4.ebuild
index 25873ff5b507..b42f83093905 100644
--- a/dev-python/netifaces/netifaces-0.10.4.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/netifaces/netifaces-0.10.4.ebuild,v 1.2 2015/03/06 22:30:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netifaces/netifaces-0.10.4.ebuild,v 1.3 2015/03/08 23:54:16 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/networkx/networkx-1.9.1.ebuild b/dev-python/networkx/networkx-1.9.1.ebuild
index e5e3a2effb49..2716ac76dd72 100644
--- a/dev-python/networkx/networkx-1.9.1.ebuild
+++ b/dev-python/networkx/networkx-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.9.1.ebuild,v 1.5 2015/03/07 08:18:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.9.1.ebuild,v 1.6 2015/03/08 23:54:20 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 COMMON_DEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild b/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild
index 09b0ebcfa433..69c8b43716ca 100644
--- a/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild,v 1.7 2015/03/06 22:46:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild,v 1.8 2015/03/09 00:04:52 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
index ffbe6d94c739..f8893ec31b64 100644
--- a/dev-python/oauth/oauth-1.0.1-r1.ebuild
+++ b/dev-python/oauth/oauth-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth/oauth-1.0.1-r1.ebuild,v 1.4 2015/03/06 22:31:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth/oauth-1.0.1-r1.ebuild,v 1.5 2015/03/08 23:54:24 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/oauth2/oauth2-1.5.211-r1.ebuild b/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
index be3cce7b276d..24083bb45468 100644
--- a/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2/oauth2-1.5.211-r1.ebuild,v 1.4 2015/03/06 22:31:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2/oauth2-1.5.211-r1.ebuild,v 1.5 2015/03/08 23:54:28 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
diff --git a/dev-python/oauth2client/oauth2client-1.4.6.ebuild b/dev-python/oauth2client/oauth2client-1.4.6.ebuild
index 2c519f32a92f..4e685f5e9036 100644
--- a/dev-python/oauth2client/oauth2client-1.4.6.ebuild
+++ b/dev-python/oauth2client/oauth2client-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2client/oauth2client-1.4.6.ebuild,v 1.2 2015/03/06 22:31:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2client/oauth2client-1.4.6.ebuild,v 1.3 2015/03/08 23:54:32 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/oauth2client/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/oauthlib/oauthlib-0.7.2.ebuild b/dev-python/oauthlib/oauthlib-0.7.2.ebuild
index a1a16b877dea..fd444626caca 100644
--- a/dev-python/oauthlib/oauthlib-0.7.2.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.7.2.ebuild,v 1.3 2015/03/06 22:31:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.7.2.ebuild,v 1.4 2015/03/08 23:54:36 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 # optional extras hard set as RDEPs. See setup.py
diff --git a/dev-python/oct2py/oct2py-1.3.0-r1.ebuild b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
index b0af0f62c1b6..ea2225245bda 100644
--- a/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
+++ b/dev-python/oct2py/oct2py-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/oct2py-1.3.0-r1.ebuild,v 1.8 2015/03/07 08:27:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/oct2py-1.3.0-r1.ebuild,v 1.9 2015/03/09 00:04:26 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 55a14010303a..efee4d2ac9ec 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -3,3 +3,4 @@ DIST oslo.config-1.4.0.tar.gz 66544 SHA256 739e76e0a83ec585a3c0415140d9e6ba1b14c
 DIST oslo.config-1.6.0.tar.gz 90139 SHA256 a88cf1af696b4d9cae783a4c8c6898e6fb4abd176f9c9906ba388e7eac5eab17 SHA512 980ad40dd86695f9dd6aa9a491354b61a1b2852c24712493e20946a3b2c664348b07c9860674f7373b52e05b0dfe4c0de9cc1615b04c0a4d35a0ef7252058c3b WHIRLPOOL 78d2a49dda926172a5879095e056736108418445316c84d7f2b9a0e0c1baa871b900e6b9da414221cbcc3a0582d72126ec209e99719d9d2e21d6a2d34832b0ec
 DIST oslo.config-1.6.1.tar.gz 90868 SHA256 4709df3a8ba05e6a47300770f1c90ade77b3d095f28e8f75191df8745268bb20 SHA512 5fca40faa8f942fca3b6178258b7ffaa8642c855225eb045a19667546359ffc709ce68a12a680ad41a7e10281d70b0b54f50da5683297f9308bd8ab862f7906a WHIRLPOOL 7b97d20873a119b5de65e34f065091e964c68c24c1424a404da39d4f04c19590f8d4c1ae63663ebc32f9cb7d8bdc8aabedbdb3873779d2a8a10b77b6d9ab9662
 DIST oslo.config-1.7.0.tar.gz 92399 SHA256 522ac2b6c2367af2d8badd07d0f9ad7434d5765cd4b62851471a5c1eee767439 SHA512 411b7e32293c1eea1b4f654e897eb3539eee617e433aa944a971cf666510987de23f342ef195fcff83578fcfc42aea2002e006667ebc1ba630e8b3577d382eaa WHIRLPOOL f8967bc89c6710bd9405ea95e70cd26a98a603302b440efc4b1229ed9e12a9e795c47845c1420a1a2313362bcd15030904b2fc95a735413051bad85d8e598c8d
+DIST oslo.config-1.9.0.tar.gz 93961 SHA256 8a7bae9c40d37303fc84660c77ef6dc946ee312dc72958703a880e2a498257fb SHA512 6a9103c57974ba419666c32cbc6c71d7cb10a9d77cc4ec2fd51b86cec4a962f716b0914591645983775218da163c8a2a1623e127e088245c49e9da1eac3fcab7 WHIRLPOOL 2345837488087effd38149f55f0b432295046ffce108a1d9738164e28476d726ac00639d9d4d5b09cfc84da214a824dd3cd2ae42c24316b2b5dbb724d6daf7eb
diff --git a/dev-python/oslo-config/oslo-config-1.4.0.ebuild b/dev-python/oslo-config/oslo-config-1.4.0.ebuild
index 73ec80f7f95d..3c296ffec833 100644
--- a/dev-python/oslo-config/oslo-config-1.4.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.4.0.ebuild,v 1.5 2015/03/06 22:31:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.4.0.ebuild,v 1.6 2015/03/08 23:54:42 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.config-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/oslo-config/oslo-config-1.9.0.ebuild b/dev-python/oslo-config/oslo-config-1.9.0.ebuild
new file mode 100644
index 000000000000..4ca16ed669f7
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-1.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.9.0.ebuild,v 1.1 2015/03/09 00:39:17 prometheanfire Exp $
+
+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 ~amd64-linux ~x86 ~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 "couldn't 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-i18n/oslo-i18n-1.4.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild
index 318affa12add..7423c5bd4b2c 100644
--- a/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild,v 1.2 2015/03/06 22:46:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild,v 1.3 2015/03/09 00:05:08 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
index e5ffadbbc411..ab27d7dc4c65 100644
--- a/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild,v 1.2 2015/03/06 22:46:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild,v 1.3 2015/03/09 00:05:13 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 )
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 # Note: not in tree
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
index 61fda8a1c1fc..3fd53d47627a 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild,v 1.3 2015/03/06 22:44:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild,v 1.4 2015/03/09 00:03:37 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # NOTE: dev-python/hacking is unecessary as there are no tests
diff --git a/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
index b4f259035ee9..2681375268a6 100644
--- a/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild,v 1.3 2015/03/06 22:46:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild,v 1.4 2015/03/09 00:05:18 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/oslotest/oslotest-1.3.0.ebuild b/dev-python/oslotest/oslotest-1.3.0.ebuild
index da957ae47325..ca94272ad837 100644
--- a/dev-python/oslotest/oslotest-1.3.0.ebuild
+++ b/dev-python/oslotest/oslotest-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/oslotest-1.3.0.ebuild,v 1.2 2015/03/06 22:31:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/oslotest-1.3.0.ebuild,v 1.3 2015/03/08 23:54:47 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/pandas/pandas-0.15.2.ebuild b/dev-python/pandas/pandas-0.15.2.ebuild
index 48d1aedb2483..d705f749e140 100644
--- a/dev-python/pandas/pandas-0.15.2.ebuild
+++ b/dev-python/pandas/pandas-0.15.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.2.ebuild,v 1.2 2015/03/06 22:44:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.15.2.ebuild,v 1.3 2015/03/09 00:03:23 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples excel html test R"
 
 EXTRA_DEPEND="
diff --git a/dev-python/paramiko/paramiko-1.15.1-r1.ebuild b/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
index 181711dc2290..0d863e85d9ff 100644
--- a/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
+++ b/dev-python/paramiko/paramiko-1.15.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.15.1-r1.ebuild,v 1.7 2015/03/07 00:17:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.15.1-r1.ebuild,v 1.8 2015/03/08 23:54:51 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/paste/paste-1.7.5.1-r1.ebuild b/dev-python/paste/paste-1.7.5.1-r1.ebuild
index 0cb4a998bd63..9d3be4e779ae 100644
--- a/dev-python/paste/paste-1.7.5.1-r1.ebuild
+++ b/dev-python/paste/paste-1.7.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1-r1.ebuild,v 1.8 2015/03/06 22:31:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1-r1.ebuild,v 1.9 2015/03/08 23:54:56 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc flup openid"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pastescript/pastescript-1.7.5-r2.ebuild b/dev-python/pastescript/pastescript-1.7.5-r2.ebuild
index dfe7716d1a51..77df79ccc326 100644
--- a/dev-python/pastescript/pastescript-1.7.5-r2.ebuild
+++ b/dev-python/pastescript/pastescript-1.7.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.5-r2.ebuild,v 1.5 2015/03/06 22:31:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.5-r2.ebuild,v 1.6 2015/03/08 23:55:00 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/patsy/patsy-0.3.0.ebuild b/dev-python/patsy/patsy-0.3.0.ebuild
index cc654d4c095d..7bcdeca77268 100644
--- a/dev-python/patsy/patsy-0.3.0.ebuild
+++ b/dev-python/patsy/patsy-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/patsy/patsy-0.3.0.ebuild,v 1.2 2015/03/06 22:45:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/patsy/patsy-0.3.0.ebuild,v 1.3 2015/03/09 00:04:43 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index 802dc73b928b..1714f1b78949 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.2-r1.ebuild,v 1.4 2015/03/07 08:26:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.2-r1.ebuild,v 1.5 2015/03/09 00:03:33 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
index 4d43d97a218b..1a604b351026 100644
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.5.6.ebuild,v 1.8 2015/03/07 08:28:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.5.6.ebuild,v 1.9 2015/03/09 00:05:32 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
index d56ea7219f0e..467734d740d4 100644
--- a/dev-python/peppercorn/peppercorn-0.5.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/peppercorn-0.5.ebuild,v 1.3 2015/03/06 22:31:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/peppercorn-0.5.ebuild,v 1.4 2015/03/08 23:55:04 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pkginfo/pkginfo-1.0.ebuild b/dev-python/pkginfo/pkginfo-1.0.ebuild
index 5c0bb0e00948..e10c1288ad3f 100644
--- a/dev-python/pkginfo/pkginfo-1.0.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pkginfo/pkginfo-1.0.ebuild,v 1.5 2015/03/06 22:32:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pkginfo/pkginfo-1.0.ebuild,v 1.6 2015/03/08 23:55:08 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
 HOMEPAGE="http://pypi.python.org/pypi/pkginfo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 LICENSE="MIT"
diff --git a/dev-python/placefinder/placefinder-0.3.ebuild b/dev-python/placefinder/placefinder-0.3.ebuild
index 72c82b346ffe..fc1b67de0612 100644
--- a/dev-python/placefinder/placefinder-0.3.ebuild
+++ b/dev-python/placefinder/placefinder-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/placefinder/placefinder-0.3.ebuild,v 1.2 2015/03/06 22:32:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/placefinder/placefinder-0.3.ebuild,v 1.3 2015/03/08 23:55:12 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild
index 97777736ff9f..ffb4c6a4f741 100644
--- a/dev-python/plyr/plyr-1.0.6.ebuild
+++ b/dev-python/plyr/plyr-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/plyr/plyr-1.0.6.ebuild,v 1.3 2015/03/06 22:32:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/plyr/plyr-1.0.6.ebuild,v 1.4 2015/03/08 23:55:16 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -16,7 +16,7 @@ HOMEPAGE="http://sahib.github.com/python-glyr/intro.html
 SRC_URI="https://github.com/sahib/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/pmw/pmw-2.0.0-r2.ebuild b/dev-python/pmw/pmw-2.0.0-r2.ebuild
index 66d5a9361430..7d7341dc274e 100644
--- a/dev-python/pmw/pmw-2.0.0-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-2.0.0-r2.ebuild,v 1.7 2015/03/07 08:18:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-2.0.0-r2.ebuild,v 1.8 2015/03/08 23:55:20 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="py3"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
index 33a11b346f59..e655eba74020 100644
--- a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21-r1.ebuild,v 1.11 2015/03/07 08:18:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21-r1.ebuild,v 1.12 2015/03/08 23:55:24 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://initd.org/pub/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/egenix-mx-base-2.0.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pudge/pudge-0.1.3-r1.ebuild b/dev-python/pudge/pudge-0.1.3-r1.ebuild
index 722c8175d9ce..682b0d8d023d 100644
--- a/dev-python/pudge/pudge-0.1.3-r1.ebuild
+++ b/dev-python/pudge/pudge-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pudge/pudge-0.1.3-r1.ebuild,v 1.2 2015/03/06 22:32:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pudge/pudge-0.1.3-r1.ebuild,v 1.3 2015/03/08 23:55:29 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
index 9d1b28a99108..198b219a6b4a 100644
--- a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
+++ b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pupynere/pupynere-1.0.15-r1.ebuild,v 1.3 2015/03/06 22:44:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pupynere/pupynere-1.0.15-r1.ebuild,v 1.4 2015/03/09 00:03:12 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/py-amqp/py-amqp-1.4.6.ebuild b/dev-python/py-amqp/py-amqp-1.4.6.ebuild
index f7e02481647d..013e4a444269 100644
--- a/dev-python/py-amqp/py-amqp-1.4.6.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.4.6.ebuild,v 1.2 2015/03/06 22:32:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.4.6.ebuild,v 1.3 2015/03/08 23:55:33 pacho Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples extras test"
 
 RDEPEND=""
diff --git a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
index a5d909bf75a3..ccb45510f00b 100644
--- a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
+++ b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild,v 1.8 2015/03/06 22:32:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild,v 1.9 2015/03/08 23:55:37 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="!dev-python/bcrypt"
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
index b8887c35d3e5..e4a88464ab9a 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild,v 1.5 2015/03/07 08:19:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild,v 1.6 2015/03/08 23:55:41 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz mirror://pypi/${PN:0:1}/${
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ~sparc x86"
 IUSE="doc"
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pyev/pyev-0.8.1.ebuild b/dev-python/pyev/pyev-0.8.1.ebuild
index 2b2a360e3860..5cf306702399 100644
--- a/dev-python/pyev/pyev-0.8.1.ebuild
+++ b/dev-python/pyev/pyev-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyev/pyev-0.8.1.ebuild,v 1.6 2015/03/06 22:32:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyev/pyev-0.8.1.ebuild,v 1.7 2015/03/08 23:55:45 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/p/pyev/${MY_P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="dev-libs/libev
diff --git a/dev-python/pyface/pyface-4.4.0.ebuild b/dev-python/pyface/pyface-4.4.0.ebuild
index 7b0cc807d7e1..d64fe97dc03e 100644
--- a/dev-python/pyface/pyface-4.4.0.ebuild
+++ b/dev-python/pyface/pyface-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyface/pyface-4.4.0.ebuild,v 1.4 2015/03/07 08:19:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyface/pyface-4.4.0.ebuild,v 1.5 2015/03/08 23:55:49 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyfits/pyfits-3.3.ebuild b/dev-python/pyfits/pyfits-3.3.ebuild
index a09cffa51a7d..d2c058ac0f1d 100644
--- a/dev-python/pyfits/pyfits-3.3.ebuild
+++ b/dev-python/pyfits/pyfits-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.3.ebuild,v 1.3 2015/03/06 22:33:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.3.ebuild,v 1.4 2015/03/08 23:55:53 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild
index 9570c40df814..8d8e40aec3ed 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild,v 1.4 2015/03/07 08:19:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild,v 1.5 2015/03/08 23:55:58 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} pypy )
@@ -14,7 +14,7 @@ SRC_URI="http://pyftpdlib.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples ssl"
 
 DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pygal/pygal-1.5.1.ebuild b/dev-python/pygal/pygal-1.5.1.ebuild
index fdb572a2f8f9..bc43a826592a 100644
--- a/dev-python/pygal/pygal-1.5.1.ebuild
+++ b/dev-python/pygal/pygal-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygal/pygal-1.5.1.ebuild,v 1.3 2015/03/06 22:33:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygal/pygal-1.5.1.ebuild,v 1.4 2015/03/08 23:56:02 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/lxml"
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index b12e6fcc2ded..2c883887d912 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygpgme/pygpgme-0.3-r1.ebuild,v 1.5 2015/03/06 22:33:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygpgme/pygpgme-0.3-r1.ebuild,v 1.6 2015/03/08 23:56:06 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-crypt/gpgme"
diff --git a/dev-python/pygraphviz/pygraphviz-1.2.ebuild b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
index 6714a9a31f65..a51f4ab017b5 100644
--- a/dev-python/pygraphviz/pygraphviz-1.2.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.2.ebuild,v 1.4 2015/03/07 08:19:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.2.ebuild,v 1.5 2015/03/08 23:56:10 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
diff --git a/dev-python/pyjwt/pyjwt-0.2.1.ebuild b/dev-python/pyjwt/pyjwt-0.2.1.ebuild
index 2686d1632768..2c5ada519ef6 100644
--- a/dev-python/pyjwt/pyjwt-0.2.1.ebuild
+++ b/dev-python/pyjwt/pyjwt-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyjwt/pyjwt-0.2.1.ebuild,v 1.4 2015/03/06 22:33:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyjwt/pyjwt-0.2.1.ebuild,v 1.5 2015/03/08 23:56:14 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/pylint/pylint-1.4.1.ebuild b/dev-python/pylint/pylint-1.4.1.ebuild
index ea9d365839b6..4edf53666968 100644
--- a/dev-python/pylint/pylint-1.4.1.ebuild
+++ b/dev-python/pylint/pylint-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-1.4.1.ebuild,v 1.5 2015/03/07 08:19:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-1.4.1.ebuild,v 1.6 2015/03/08 23:56:18 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pynut/pynut-1.2.ebuild b/dev-python/pynut/pynut-1.2.ebuild
index b8535d5f5c8d..226603dc4abe 100644
--- a/dev-python/pynut/pynut-1.2.ebuild
+++ b/dev-python/pynut/pynut-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pynut/pynut-1.2.ebuild,v 1.2 2015/03/06 22:33:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pynut/pynut-1.2.ebuild,v 1.3 2015/03/08 23:56:23 pacho Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.lestat.st/_media/informatique/projets/pynut/python-${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/python-${P}"
diff --git a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
index 58ff6a4447a7..3c366f9db844 100644
--- a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
+++ b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pynzb/pynzb-0.1.0-r1.ebuild,v 1.5 2015/03/06 22:33:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pynzb/pynzb-0.1.0-r1.ebuild,v 1.6 2015/03/08 23:56:27 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopencl/pyopencl-2014.1.ebuild b/dev-python/pyopencl/pyopencl-2014.1.ebuild
index 644de8f636ff..c01dfe22210f 100644
--- a/dev-python/pyopencl/pyopencl-2014.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2014.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2014.1.ebuild,v 1.4 2015/03/06 22:34:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2014.1.ebuild,v 1.5 2015/03/08 23:56:31 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples opengl"
 
 RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
diff --git a/dev-python/pypax/pypax-0.9.0.ebuild b/dev-python/pypax/pypax-0.9.0.ebuild
index 91bef9155300..408952d3ac17 100644
--- a/dev-python/pypax/pypax-0.9.0.ebuild
+++ b/dev-python/pypax/pypax-0.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.9.0.ebuild,v 1.4 2014/12/27 19:25:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.9.0.ebuild,v 1.5 2015/03/08 23:56:36 pacho Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/elfix-${PV}/scripts"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+ptpax +xtpax"
 
 REQUIRED_USE="|| ( ptpax xtpax )"
diff --git a/dev-python/pyphen/pyphen-0.9.1.ebuild b/dev-python/pyphen/pyphen-0.9.1.ebuild
index 124ca809762f..ab98438663e4 100644
--- a/dev-python/pyphen/pyphen-0.9.1.ebuild
+++ b/dev-python/pyphen/pyphen-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyphen/pyphen-0.9.1.ebuild,v 1.4 2015/03/06 22:34:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyphen/pyphen-0.9.1.ebuild,v 1.5 2015/03/08 23:56:41 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/Kozea/Pyphen"
 
 LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
index 0108e08f4271..e8819b401958 100644
--- a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild,v 1.6 2015/03/07 08:20:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild,v 1.7 2015/03/08 23:56:45 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="|| ( PSF-2 ZPL )"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-python/decoratortools-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyquery/pyquery-1.2.9.ebuild b/dev-python/pyquery/pyquery-1.2.9.ebuild
index 007ce76c41ac..dde4d20dd640 100644
--- a/dev-python/pyquery/pyquery-1.2.9.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.9.ebuild,v 1.8 2015/03/07 08:20:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.9.ebuild,v 1.9 2015/03/08 23:56:49 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="beautifulsoup3 test"
 
 RDEPEND=">=dev-python/lxml-2.1[beautifulsoup3?,${PYTHON_USEDEP}]
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
index cbfe37ef9025..f2ff53d7b30f 100644
--- a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
+++ b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild,v 1.5 2015/03/06 22:34:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild,v 1.6 2015/03/08 23:56:55 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://pyqwt.sourceforge.net/"
 
 SLOT="5"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ia64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 x86"
 IUSE="debug doc examples svg"
 
 RDEPEND="
diff --git a/dev-python/pyramid/pyramid-1.5.1.ebuild b/dev-python/pyramid/pyramid-1.5.1.ebuild
index b5821a065162..b7aeb50eced9 100644
--- a/dev-python/pyramid/pyramid-1.5.1.ebuild
+++ b/dev-python/pyramid/pyramid-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.5.1.ebuild,v 1.5 2015/03/06 22:34:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.5.1.ebuild,v 1.6 2015/03/08 23:56:59 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 #IUSE="test"
 # tests would pull in dev-python/zope-deprecation with its deps - not a good idea
diff --git a/dev-python/python-dateutil/python-dateutil-2.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.2.ebuild
index 11cbcd190ec0..a7f7688784cc 100644
--- a/dev-python/python-dateutil/python-dateutil-2.2.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.2.ebuild,v 1.8 2015/03/07 08:20:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.2.ebuild,v 1.9 2015/03/08 23:57:04 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/python-digest/python-digest-1.7-r1.ebuild b/dev-python/python-digest/python-digest-1.7-r1.ebuild
index 13e48ed0228c..f1e8394be014 100644
--- a/dev-python/python-digest/python-digest-1.7-r1.ebuild
+++ b/dev-python/python-digest/python-digest-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-digest/python-digest-1.7-r1.ebuild,v 1.4 2015/03/06 22:34:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-digest/python-digest-1.7-r1.ebuild,v 1.5 2015/03/08 23:57:11 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A Python library to aid in implementing HTTP Digest Authentication"
 HOMEPAGE="http://pypi.python.org/pypi/python-digest/ https://bitbucket.org/akoha/python-digest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/python-gflags/python-gflags-2.0.ebuild b/dev-python/python-gflags/python-gflags-2.0.ebuild
index daf5aedc2356..7203e95a6eec 100644
--- a/dev-python/python-gflags/python-gflags-2.0.ebuild
+++ b/dev-python/python-gflags/python-gflags-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gflags/python-gflags-2.0.ebuild,v 1.13 2015/03/06 22:34:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gflags/python-gflags-2.0.ebuild,v 1.14 2015/03/08 23:57:15 pacho Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://python-gflags.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild
index c922131aabd8..45f660fb9c69 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild,v 1.2 2015/03/06 22:44:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.0.0.ebuild,v 1.3 2015/03/09 00:03:42 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 # Note: blacklist version not in portage:
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
index 98182af049dc..6fae5af60d32 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild,v 1.5 2015/03/06 22:34:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild,v 1.6 2015/03/08 23:57:19 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild b/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
index fc0b9768965a..91e4aed117ea 100644
--- a/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
+++ b/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild,v 1.6 2015/03/07 08:21:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild,v 1.7 2015/03/08 23:57:23 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="doc examples"
 
 RDEPEND="media-libs/libdiscid"
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 7c344474f814..05724da80859 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/python-openid-2.2.5-r1.ebuild,v 1.8 2015/03/06 22:35:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/python-openid-2.2.5-r1.ebuild,v 1.9 2015/03/08 23:57:27 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
index 8a176e193c3b..deabc90b7487 100644
--- a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
+++ b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild,v 1.2 2015/03/06 22:35:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild,v 1.3 2015/03/08 23:57:31 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 PATCHES=( "${FILESDIR}/0.8.1-python3.4.patch" )
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild
index cd605cac4fec..445ebbe7829a 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild,v 1.7 2015/03/07 00:18:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild,v 1.8 2015/03/08 23:57:35 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbre
 SRC_URI="https://github.com/andialbrecht/sqlparse/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc examples test"
 
diff --git a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
index 4be78c2039f3..d69ac5ec2385 100644
--- a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
+++ b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild,v 1.3 2015/03/06 22:47:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild,v 1.4 2015/03/09 00:05:37 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python{3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gfxmonk/${PN#*-}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/pytools/pytools-2014.3.5.ebuild b/dev-python/pytools/pytools-2014.3.5.ebuild
index db7c69888373..c1f036ea160f 100644
--- a/dev-python/pytools/pytools-2014.3.5.ebuild
+++ b/dev-python/pytools/pytools-2014.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2014.3.5.ebuild,v 1.2 2015/03/06 22:45:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2014.3.5.ebuild,v 1.3 2015/03/09 00:04:01 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pyx/pyx-0.13.ebuild b/dev-python/pyx/pyx-0.13.ebuild
index b146b9ea4394..ba3590872693 100644
--- a/dev-python/pyx/pyx-0.13.ebuild
+++ b/dev-python/pyx/pyx-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.13.ebuild,v 1.5 2015/03/06 22:35:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.13.ebuild,v 1.6 2015/03/08 23:57:40 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python3_{3,4} )
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="virtual/tex-base
diff --git a/dev-python/pyzmq/pyzmq-14.4.1.ebuild b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
index 66c71d2458ef..eb78ab28968d 100644
--- a/dev-python/pyzmq/pyzmq-14.4.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild,v 1.9 2015/03/07 08:21:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.4.1.ebuild,v 1.10 2015/03/08 23:57:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="doc examples green test"
 
diff --git a/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild b/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
index 2e24305d1751..cb5fbbc08f4a 100644
--- a/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
+++ b/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild,v 1.8 2015/03/06 22:35:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild,v 1.9 2015/03/08 23:57:44 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 PY2_USEDEP=$(python_gen_usedep 'python2*')
diff --git a/dev-python/queuelib/queuelib-1.1.1.ebuild b/dev-python/queuelib/queuelib-1.1.1.ebuild
index beb1f8d7c57e..841e301e07bf 100644
--- a/dev-python/queuelib/queuelib-1.1.1.ebuild
+++ b/dev-python/queuelib/queuelib-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/queuelib/queuelib-1.1.1.ebuild,v 1.4 2015/03/06 22:35:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/queuelib/queuelib-1.1.1.ebuild,v 1.5 2015/03/08 23:57:49 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/scrapy/${PN}/archive/v${PV}.tar.gz -> ${PN}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 S="${WORKDIR}/${PN}"
diff --git a/dev-python/rdflib/rdflib-4.1.2.ebuild b/dev-python/rdflib/rdflib-4.1.2.ebuild
index c00f355e265f..ee2c1e04aec6 100644
--- a/dev-python/rdflib/rdflib-4.1.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.2.ebuild,v 1.11 2015/03/07 08:22:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.2.ebuild,v 1.12 2015/03/08 23:57:53 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild b/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
index c86b69bcf6ae..29f8a8b3b09e 100644
--- a/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
+++ b/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild,v 1.4 2015/03/06 22:36:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild,v 1.5 2015/03/08 23:57:58 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
 HOMEPAGE="http://pypi.python.org/pypi/recaptcha-client/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 LICENSE="MIT"
diff --git a/dev-python/rednose/rednose-0.4.1.ebuild b/dev-python/rednose/rednose-0.4.1.ebuild
index 6fc6aa4bcccd..fc740b568fac 100644
--- a/dev-python/rednose/rednose-0.4.1.ebuild
+++ b/dev-python/rednose/rednose-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rednose/rednose-0.4.1.ebuild,v 1.3 2015/03/06 22:46:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rednose/rednose-0.4.1.ebuild,v 1.4 2015/03/09 00:05:28 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python{3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
index 8198ba5cab20..ad81bdf439fd 100644
--- a/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild,v 1.5 2015/03/06 22:36:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild,v 1.6 2015/03/08 23:58:02 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/requests-mock/requests-mock-0.5.1.ebuild b/dev-python/requests-mock/requests-mock-0.5.1.ebuild
index 4f3920dc6c5e..508b8a6fb311 100644
--- a/dev-python/requests-mock/requests-mock-0.5.1.ebuild
+++ b/dev-python/requests-mock/requests-mock-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-mock/requests-mock-0.5.1.ebuild,v 1.3 2015/03/06 22:36:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-mock/requests-mock-0.5.1.ebuild,v 1.4 2015/03/08 23:58:06 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.4.1.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.4.1.ebuild
index 2c21d7b2c3e2..b5dc154f15c5 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-0.4.1.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-oauthlib/requests-oauthlib-0.4.1.ebuild,v 1.2 2015/03/06 22:36:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-oauthlib/requests-oauthlib-0.4.1.ebuild,v 1.3 2015/03/08 23:58:10 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 14938e8701e0..b3180a58247b 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.2.ebuild,v 1.7 2015/03/07 08:27:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.2.ebuild,v 1.8 2015/03/09 00:04:05 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="+cli doc examples test"
 
 PY27_USEDEP="$(python_gen_usedep python2_7)"
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
index de3eab66e4bf..bf4fad10df2d 100644
--- a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild,v 1.4 2015/03/06 22:36:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild,v 1.5 2015/03/08 23:58:14 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pnpnpn/retry-decorator/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/roman/roman-2.0.0.ebuild b/dev-python/roman/roman-2.0.0.ebuild
index 8cf7fd0b1611..4f861e6a10bf 100644
--- a/dev-python/roman/roman-2.0.0.ebuild
+++ b/dev-python/roman/roman-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/roman/roman-2.0.0.ebuild,v 1.4 2015/03/06 22:36:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/roman/roman-2.0.0.ebuild,v 1.5 2015/03/08 23:58:18 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="!<dev-python/docutils-0.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/routes/routes-2.0.ebuild b/dev-python/routes/routes-2.0.ebuild
index 54ffdb1994de..6315ef877222 100644
--- a/dev-python/routes/routes-2.0.ebuild
+++ b/dev-python/routes/routes-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-2.0.ebuild,v 1.4 2015/03/06 22:36:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-2.0.ebuild,v 1.5 2015/03/08 23:58:22 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="dev-python/webob[${PYTHON_USEDEP}]
diff --git a/dev-python/rpy/rpy-2.5.4.ebuild b/dev-python/rpy/rpy-2.5.4.ebuild
index 9c162b11f98d..26444086cd19 100644
--- a/dev-python/rpy/rpy-2.5.4.ebuild
+++ b/dev-python/rpy/rpy-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.5.4.ebuild,v 1.2 2015/03/06 22:36:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.5.4.ebuild,v 1.3 2015/03/08 23:58:28 pacho Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/rpyc/rpyc-3.2.3-r1.ebuild b/dev-python/rpyc/rpyc-3.2.3-r1.ebuild
index 943b1bac22bb..c405bc91a0f7 100644
--- a/dev-python/rpyc/rpyc-3.2.3-r1.ebuild
+++ b/dev-python/rpyc/rpyc-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpyc/rpyc-3.2.3-r1.ebuild,v 1.3 2015/03/06 22:36:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpyc/rpyc-3.2.3-r1.ebuild,v 1.4 2015/03/08 23:58:33 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -12,7 +12,7 @@ HOMEPAGE="http://rpyc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scimath/scimath-4.1.2-r1.ebuild b/dev-python/scimath/scimath-4.1.2-r1.ebuild
index 511ff1cc3348..9058b4414c01 100644
--- a/dev-python/scimath/scimath-4.1.2-r1.ebuild
+++ b/dev-python/scimath/scimath-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scimath/scimath-4.1.2-r1.ebuild,v 1.3 2015/03/06 22:37:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scimath/scimath-4.1.2-r1.ebuild,v 1.4 2015/03/08 23:58:37 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/scripttest/scripttest-1.2-r1.ebuild b/dev-python/scripttest/scripttest-1.2-r1.ebuild
index a5eef7186e08..68d0e29c1c72 100644
--- a/dev-python/scripttest/scripttest-1.2-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scripttest/scripttest-1.2-r1.ebuild,v 1.2 2015/03/06 22:37:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scripttest/scripttest-1.2-r1.ebuild,v 1.3 2015/03/08 23:58:41 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/selenium/selenium-2.42.1.ebuild b/dev-python/selenium/selenium-2.42.1.ebuild
index b20dcf5b88db..504e445a6fdf 100644
--- a/dev-python/selenium/selenium-2.42.1.ebuild
+++ b/dev-python/selenium/selenium-2.42.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/selenium/selenium-2.42.1.ebuild,v 1.2 2015/03/06 22:37:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/selenium/selenium-2.42.1.ebuild,v 1.3 2015/03/08 23:58:45 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Python language binding for Selenium Remote Control (version 1.0 an
 HOMEPAGE="http://pypi.python.org/pypi/selenium/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/setuptools-git/setuptools-git-1.0.ebuild b/dev-python/setuptools-git/setuptools-git-1.0.ebuild
index 4750e708459b..ef4367080278 100644
--- a/dev-python/setuptools-git/setuptools-git-1.0.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools-git/setuptools-git-1.0.ebuild,v 1.4 2015/03/06 22:37:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools-git/setuptools-git-1.0.ebuild,v 1.5 2015/03/08 23:58:49 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/setuptools/setuptools-12.0.1.ebuild b/dev-python/setuptools/setuptools-12.0.1.ebuild
index f04db4bec37e..85dcba0285a7 100644
--- a/dev-python/setuptools/setuptools-12.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-12.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-12.0.1.ebuild,v 1.6 2015/03/07 08:22:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-12.0.1.ebuild,v 1.7 2015/03/08 23:58:53 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
index 2ad962c00a2e..a4f609debe53 100644
--- a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
+++ b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild,v 1.6 2015/03/06 22:37:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild,v 1.7 2015/03/08 23:58:58 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -12,7 +12,7 @@ HOMEPAGE="http://pypi.python.org/pypi/setuptools_hg http://bitbucket.org/jezdez/
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
index 79946db1bed4..a052e99a9ebe 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild,v 1.3 2015/03/06 22:45:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild,v 1.4 2015/03/09 00:04:39 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/smmap/smmap-0.9.0.ebuild b/dev-python/smmap/smmap-0.9.0.ebuild
index 0618925f02b3..aa12134e1b62 100644
--- a/dev-python/smmap/smmap-0.9.0.ebuild
+++ b/dev-python/smmap/smmap-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/smmap/smmap-0.9.0.ebuild,v 1.2 2015/03/06 22:37:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/smmap/smmap-0.9.0.ebuild,v 1.3 2015/03/08 23:59:02 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
index efe85ae8027f..2caf0302b79d 100644
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snappy/snappy-0.5-r2.ebuild,v 1.3 2015/03/06 22:37:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snappy/snappy-0.5-r2.ebuild,v 1.4 2015/03/08 23:59:06 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://pypi.python.org/pypi/python-snappy"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 
 DEPEND=">=app-arch/snappy-1.0.2"
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
index 9cd5fe9d4b0d..5facbcc4963d 100644
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/socketpool-0.5.3.ebuild,v 1.6 2015/03/07 08:23:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/socketpool-0.5.3.ebuild,v 1.7 2015/03/08 23:59:10 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} pypy )
@@ -11,7 +11,7 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="http://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="examples test"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/socksipy/socksipy-1.02.ebuild b/dev-python/socksipy/socksipy-1.02.ebuild
index 93c7f0ec0f92..3cb31906eb7a 100644
--- a/dev-python/socksipy/socksipy-1.02.ebuild
+++ b/dev-python/socksipy/socksipy-1.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/socksipy/socksipy-1.02.ebuild,v 1.4 2015/03/06 22:38:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/socksipy/socksipy-1.02.ebuild,v 1.5 2015/03/08 23:59:14 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -16,7 +16,7 @@ SRC_URI="http://socksipy-branch.googlecode.com/files/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/south/south-1.0.ebuild b/dev-python/south/south-1.0.ebuild
index f6760bab1553..e022d8068889 100644
--- a/dev-python/south/south-1.0.ebuild
+++ b/dev-python/south/south-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/south/south-1.0.ebuild,v 1.4 2015/03/06 22:38:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/south/south-1.0.ebuild,v 1.5 2015/03/08 23:59:18 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="<dev-python/django-1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
index 016ecd10c24c..2282834f5b8c 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild,v 1.4 2015/03/07 08:23:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild,v 1.5 2015/03/08 23:59:22 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild
index 427c79c0d63f..78f31c45e7d1 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild,v 1.7 2015/03/07 08:23:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild,v 1.8 2015/03/08 23:59:26 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild
index 1b48af9f6649..d9d1bcc9fdb1 100644
--- a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild,v 1.2 2015/03/06 22:38:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild,v 1.3 2015/03/08 23:59:30 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ HOMEPAGE="http://bitbucket.org/birkenfeld/sphinx-contrib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild
index 6fc6161b287e..a50f40d476da 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild,v 1.2 2015/03/06 22:38:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild,v 1.3 2015/03/08 23:59:34 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
index 26454cc4df1d..9d66d646197e 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild,v 1.7 2015/03/06 22:38:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild,v 1.8 2015/03/08 23:59:38 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild b/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
index 7bc31ab84d0d..32d4108b4c67 100644
--- a/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
+++ b/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild,v 1.3 2015/03/06 22:38:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild,v 1.4 2015/03/08 23:59:42 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE=""
 
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
index 5d624d727724..361730c075b1 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild,v 1.8 2015/03/07 08:23:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild,v 1.9 2015/03/08 23:59:46 pacho Exp $
 
 EAPI=5
 # py3 has a syntax errors. On testing it is underdone
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
index 55b84956f02a..aa457f5d8fc7 100644
--- a/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
+++ b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild,v 1.6 2015/03/07 08:24:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild,v 1.7 2015/03/08 23:59:51 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="http://yum.baseurl.org/download/yum-metadata-parser/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 # glib and libxml2 are used via an extension module written in C.
diff --git a/dev-python/statsmodels/statsmodels-0.6.1.ebuild b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
index e9371a44ff9d..e0395b9052a1 100644
--- a/dev-python/statsmodels/statsmodels-0.6.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/statsmodels/statsmodels-0.6.1.ebuild,v 1.4 2015/03/06 22:39:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/statsmodels/statsmodels-0.6.1.ebuild,v 1.5 2015/03/08 23:59:55 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 CDEPEND="
diff --git a/dev-python/stevedore/stevedore-1.1.0.ebuild b/dev-python/stevedore/stevedore-1.1.0.ebuild
index c67aeebb5eee..aa50d0e78d21 100644
--- a/dev-python/stevedore/stevedore-1.1.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/stevedore-1.1.0.ebuild,v 1.3 2015/03/06 22:39:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/stevedore-1.1.0.ebuild,v 1.4 2015/03/09 00:00:00 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild b/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
index 45575a8aeb85..e24d68d3b104 100644
--- a/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
+++ b/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild,v 1.5 2015/03/06 22:39:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild,v 1.6 2015/03/09 00:00:05 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild b/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild
index 9195949dc76a..f267d8ffdb84 100644
--- a/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild
+++ b/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild,v 1.4 2015/03/06 22:45:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild,v 1.5 2015/03/09 00:04:35 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sure/sure-1.2.5-r1.ebuild b/dev-python/sure/sure-1.2.5-r1.ebuild
index 0c3e1e1fd313..91aa9e6ff4a4 100644
--- a/dev-python/sure/sure-1.2.5-r1.ebuild
+++ b/dev-python/sure/sure-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sure/sure-1.2.5-r1.ebuild,v 1.3 2015/03/06 22:46:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sure/sure-1.2.5-r1.ebuild,v 1.4 2015/03/09 00:05:04 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}-r1"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/symboltype/symboltype-1.0.ebuild b/dev-python/symboltype/symboltype-1.0.ebuild
index 1d3f0784453b..198060c331be 100644
--- a/dev-python/symboltype/symboltype-1.0.ebuild
+++ b/dev-python/symboltype/symboltype-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/symboltype/symboltype-1.0.ebuild,v 1.4 2015/03/06 22:39:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/symboltype/symboltype-1.0.ebuild,v 1.5 2015/03/09 00:00:09 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ DESCRIPTION="Gives access to the peak.util.symbols module"
 HOMEPAGE=" http://peak.telecommunity.com/DevCenter/SymbolType http://pypi.python.org/pypi/SymbolType"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 LICENSE="ZPL"
 SLOT="0"
diff --git a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
index 270c31322486..d6743a068d04 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/termcolor/termcolor-1.1.0-r1.ebuild,v 1.7 2015/03/06 22:39:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/termcolor/termcolor-1.1.0-r1.ebuild,v 1.8 2015/03/09 00:00:13 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/testfixtures/testfixtures-3.0.0.ebuild b/dev-python/testfixtures/testfixtures-3.0.0.ebuild
index d3183e7834f2..603d596edac1 100644
--- a/dev-python/testfixtures/testfixtures-3.0.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v 1.6 2015/03/06 22:39:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v 1.7 2015/03/09 00:00:17 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index 69c89acd6312..99b8e2b900f6 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18-r1.ebuild,v 1.9 2015/03/07 08:26:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18-r1.ebuild,v 1.10 2015/03/09 00:03:47 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index 4d4e0d3146ba..566394afde73 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/testresources-0.2.7-r2.ebuild,v 1.10 2015/03/07 08:28:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/testresources-0.2.7-r2.ebuild,v 1.11 2015/03/09 00:05:00 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/timelib/timelib-0.2.4-r1.ebuild b/dev-python/timelib/timelib-0.2.4-r1.ebuild
index 49bd69d2387c..3412baf025fc 100644
--- a/dev-python/timelib/timelib-0.2.4-r1.ebuild
+++ b/dev-python/timelib/timelib-0.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/timelib-0.2.4-r1.ebuild,v 1.6 2015/03/06 22:39:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/timelib-0.2.4-r1.ebuild,v 1.7 2015/03/09 00:00:21 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="PHP-3.01 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/toolz/toolz-0.7.1.ebuild b/dev-python/toolz/toolz-0.7.1.ebuild
index 420fd19f4950..05154379ff57 100644
--- a/dev-python/toolz/toolz-0.7.1.ebuild
+++ b/dev-python/toolz/toolz-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/toolz/toolz-0.7.1.ebuild,v 1.2 2015/03/06 22:39:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/toolz/toolz-0.7.1.ebuild,v 1.3 2015/03/09 00:00:25 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/tpg/tpg-3.2.2-r1.ebuild b/dev-python/tpg/tpg-3.2.2-r1.ebuild
index e04bfbf728f0..b67c7410647f 100644
--- a/dev-python/tpg/tpg-3.2.2-r1.ebuild
+++ b/dev-python/tpg/tpg-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/tpg-3.2.2-r1.ebuild,v 1.4 2015/03/07 08:24:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/tpg-3.2.2-r1.ebuild,v 1.5 2015/03/09 00:00:29 pacho Exp $
 
 EAPI=5
 # py2.6 doesn't pass tests
@@ -16,7 +16,7 @@ SRC_URI="http://christophe.delord.free.fr/tpg/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="doc examples"
 DOCS=( ChangeLog README THANKS doc/tpg.pdf )
 
diff --git a/dev-python/traits/traits-4.5.0.ebuild b/dev-python/traits/traits-4.5.0.ebuild
index 7ba216066db3..f1646916e0bf 100644
--- a/dev-python/traits/traits-4.5.0.ebuild
+++ b/dev-python/traits/traits-4.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.5.0.ebuild,v 1.4 2015/03/07 08:24:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.5.0.ebuild,v 1.5 2015/03/09 00:00:33 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/traitsui/traitsui-4.4.0.ebuild b/dev-python/traitsui/traitsui-4.4.0.ebuild
index 9e83c30a826b..ce65b332fa93 100644
--- a/dev-python/traitsui/traitsui-4.4.0.ebuild
+++ b/dev-python/traitsui/traitsui-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/traitsui-4.4.0.ebuild,v 1.4 2015/03/07 08:24:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/traitsui-4.4.0.ebuild,v 1.5 2015/03/09 00:00:37 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
index cf8a967baf76..091aa283cb8a 100644
--- a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild,v 1.4 2015/03/07 08:24:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild,v 1.5 2015/03/09 00:00:41 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted SSHv2 implementation"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
index 2558fe038025..36497cc4daad 100644
--- a/dev-python/twisted-core/twisted-core-13.2.0.ebuild
+++ b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-13.2.0.ebuild,v 1.6 2015/03/07 08:25:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-13.2.0.ebuild,v 1.7 2015/03/09 00:00:45 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic twisted-r1
 
 DESCRIPTION="An asynchronous networking framework written in Python"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt gtk serial"
 
 DEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
index 8fbedc9a2883..54d0457be15c 100644
--- a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild,v 1.4 2015/03/07 08:25:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild,v 1.5 2015/03/09 00:00:50 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted documentation system"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
index 53406bfd8c80..ab0fd01396ff 100644
--- a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild,v 1.4 2015/03/07 08:25:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild,v 1.5 2015/03/09 00:00:54 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="A Twisted Mail library, server and client"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-names/twisted-names-13.2.0.ebuild b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
index 05ef29a4da19..164a0cc21e78 100644
--- a/dev-python/twisted-names/twisted-names-13.2.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-13.2.0.ebuild,v 1.4 2015/03/07 08:25:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-13.2.0.ebuild,v 1.5 2015/03/09 00:00:58 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="A Twisted DNS implementation"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted-news/twisted-news-13.2.0.ebuild b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
index e4b786b4e756..e57b2cdf6036 100644
--- a/dev-python/twisted-news/twisted-news-13.2.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-13.2.0.ebuild,v 1.5 2015/03/07 08:25:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-13.2.0.ebuild,v 1.6 2015/03/09 00:01:02 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted News is an NNTP server and programming library"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
index 4e16ba188c94..c6a383b50b99 100644
--- a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild,v 1.2 2015/03/06 22:40:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild,v 1.3 2015/03/09 00:01:06 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted low-level networking"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
index b22df37096d8..96f4561d7283 100644
--- a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild,v 1.5 2015/03/07 08:25:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild,v 1.6 2015/03/09 00:01:10 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
index 09e7d8c701e8..c26edb8d8a00 100644
--- a/dev-python/twisted-web/twisted-web-13.2.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-13.2.0.ebuild,v 1.5 2015/03/07 08:25:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-13.2.0.ebuild,v 1.6 2015/03/09 00:01:14 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -10,7 +10,7 @@ inherit twisted-r1
 MY_PN="TwistedWeb"
 DESCRIPTION="Twisted web server, programmable in Python"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-words/twisted-words-13.2.0.ebuild b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
index 46bf98c7a30a..b16fa1dda428 100644
--- a/dev-python/twisted-words/twisted-words-13.2.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-13.2.0.ebuild,v 1.5 2015/03/07 08:25:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-13.2.0.ebuild,v 1.6 2015/03/09 00:01:19 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Words contains Instant Messaging implementations"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
diff --git a/dev-python/twython/twython-3.2.0.ebuild b/dev-python/twython/twython-3.2.0.ebuild
index 89a4f07fda11..e705e9a1d646 100644
--- a/dev-python/twython/twython-3.2.0.ebuild
+++ b/dev-python/twython/twython-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twython/twython-3.2.0.ebuild,v 1.3 2015/03/06 22:41:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twython/twython-3.2.0.ebuild,v 1.4 2015/03/09 00:01:23 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/txAMQP/txAMQP-0.6.2.ebuild b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
index 032581736433..121b5e2f19cb 100644
--- a/dev-python/txAMQP/txAMQP-0.6.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.6.2.ebuild,v 1.7 2015/03/06 22:41:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.6.2.ebuild,v 1.8 2015/03/09 00:01:27 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -11,7 +11,7 @@ HOMEPAGE="https://launchpad.net/txamqp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
index 2153cfba8736..9844e0057b71 100644
--- a/dev-python/ujson/ujson-1.33.ebuild
+++ b/dev-python/ujson/ujson-1.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ujson/ujson-1.33.ebuild,v 1.5 2015/03/06 22:41:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ujson/ujson-1.33.ebuild,v 1.6 2015/03/09 00:01:31 pacho Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild b/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild
index 1b9e9ec90008..67d3cab9eebf 100644
--- a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild,v 1.2 2015/03/06 22:41:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild,v 1.3 2015/03/09 00:01:35 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild
index 3e6b0a2b0321..5b997d8d95fc 100644
--- a/dev-python/uritemplate/uritemplate-0.6.ebuild
+++ b/dev-python/uritemplate/uritemplate-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild,v 1.4 2015/03/06 22:41:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/uritemplate/uritemplate-0.6.ebuild,v 1.5 2015/03/09 00:01:39 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/urllib3/urllib3-1.9.1.ebuild b/dev-python/urllib3/urllib3-1.9.1.ebuild
index 26e186502654..c572fbd5498c 100644
--- a/dev-python/urllib3/urllib3-1.9.1.ebuild
+++ b/dev-python/urllib3/urllib3-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.9.1.ebuild,v 1.6 2015/03/07 08:26:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.9.1.ebuild,v 1.7 2015/03/09 00:01:43 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/venusian/venusian-1.0.ebuild b/dev-python/venusian/venusian-1.0.ebuild
index ff52059749a8..00f096869a5c 100644
--- a/dev-python/venusian/venusian-1.0.ebuild
+++ b/dev-python/venusian/venusian-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/venusian/venusian-1.0.ebuild,v 1.2 2015/03/06 22:41:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/venusian/venusian-1.0.ebuild,v 1.3 2015/03/09 00:01:48 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
index b0e4d3d5f55e..ea837a736460 100644
--- a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
+++ b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/versiontools/versiontools-1.9.1-r1.ebuild,v 1.5 2015/03/06 22:41:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/versiontools/versiontools-1.9.1-r1.ebuild,v 1.6 2015/03/09 00:01:52 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Smart replacement for plain tuple used in __version__"
 HOMEPAGE="http://pypi.python.org/pypi/versiontools/ https://launchpad.net/versiontools"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 LICENSE="GPL-2"
diff --git a/dev-python/vertex/vertex-0.3.0-r1.ebuild b/dev-python/vertex/vertex-0.3.0-r1.ebuild
index 46eb7f75b4b6..6119677c5cd8 100644
--- a/dev-python/vertex/vertex-0.3.0-r1.ebuild
+++ b/dev-python/vertex/vertex-0.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/vertex-0.3.0-r1.ebuild,v 1.2 2015/03/06 22:41:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/vertex-0.3.0-r1.ebuild,v 1.3 2015/03/09 00:01:56 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -11,7 +11,7 @@ DESCRIPTION="An implementation of the Q2Q protocol"
 HOMEPAGE="http://divmod.org/trac/wiki/DivmodVertex http://pypi.python.org/pypi/Vertex"
 SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/openssl
diff --git a/dev-python/waitress/waitress-0.8.9.ebuild b/dev-python/waitress/waitress-0.8.9.ebuild
index c2784ef53dda..c17296ce4976 100644
--- a/dev-python/waitress/waitress-0.8.9.ebuild
+++ b/dev-python/waitress/waitress-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/waitress-0.8.9.ebuild,v 1.8 2015/03/07 08:26:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/waitress-0.8.9.ebuild,v 1.9 2015/03/09 00:02:00 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz \
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/warlock/warlock-1.0.1.ebuild b/dev-python/warlock/warlock-1.0.1.ebuild
index 44264e2ceb68..eebd95e292d3 100644
--- a/dev-python/warlock/warlock-1.0.1.ebuild
+++ b/dev-python/warlock/warlock-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/warlock/warlock-1.0.1.ebuild,v 1.4 2015/03/06 22:42:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/warlock/warlock-1.0.1.ebuild,v 1.5 2015/03/09 00:02:04 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webassets/webassets-0.10.1.ebuild b/dev-python/webassets/webassets-0.10.1.ebuild
index 97fbc8b44236..da460893d2ca 100644
--- a/dev-python/webassets/webassets-0.10.1.ebuild
+++ b/dev-python/webassets/webassets-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webassets/webassets-0.10.1.ebuild,v 1.4 2015/03/06 22:42:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webassets/webassets-0.10.1.ebuild,v 1.5 2015/03/09 00:02:08 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/websocket-client/websocket-client-0.21.0.ebuild b/dev-python/websocket-client/websocket-client-0.21.0.ebuild
index 7440d3c613e7..bfdde1b0e842 100644
--- a/dev-python/websocket-client/websocket-client-0.21.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.21.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/websocket-client/websocket-client-0.21.0.ebuild,v 1.2 2015/03/06 22:42:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/websocket-client/websocket-client-0.21.0.ebuild,v 1.3 2015/03/09 00:02:12 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/liris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/webtest/webtest-2.0.16.ebuild b/dev-python/webtest/webtest-2.0.16.ebuild
index 76c9578febfb..1d358d63f4ba 100644
--- a/dev-python/webtest/webtest-2.0.16.ebuild
+++ b/dev-python/webtest/webtest-2.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.16.ebuild,v 1.4 2015/03/07 08:26:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.16.ebuild,v 1.5 2015/03/09 00:02:16 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 #nose<1.3.0
diff --git a/dev-python/whisper/whisper-0.9.13.ebuild b/dev-python/whisper/whisper-0.9.13.ebuild
index 9f1547db64d3..affc144d2a2f 100644
--- a/dev-python/whisper/whisper-0.9.13.ebuild
+++ b/dev-python/whisper/whisper-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whisper/whisper-0.9.13.ebuild,v 1.2 2015/03/06 22:42:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whisper/whisper-0.9.13.ebuild,v 1.3 2015/03/09 00:02:21 pacho Exp $
 
 EAPI=5
 
@@ -13,6 +13,6 @@ HOMEPAGE="http://graphite.wikidot.com/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild
index f14f6eade07b..f330850c3695 100644
--- a/dev-python/ws4py/ws4py-0.3.4.ebuild
+++ b/dev-python/ws4py/ws4py-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild,v 1.3 2015/03/06 22:42:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild,v 1.4 2015/03/09 00:02:25 pacho Exp $
 
 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
diff --git a/dev-python/wsaccel/wsaccel-0.6.2.ebuild b/dev-python/wsaccel/wsaccel-0.6.2.ebuild
index 64f3a9004269..c154cc50e8c2 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsaccel/wsaccel-0.6.2.ebuild,v 1.4 2015/03/06 22:42:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsaccel/wsaccel-0.6.2.ebuild,v 1.5 2015/03/09 00:02:29 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 #RDEPEND=""
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
index 8d5049b53e92..ceed52cd12d3 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild,v 1.12 2015/03/07 08:26:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild,v 1.13 2015/03/09 00:02:33 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/xcffib-0.1.10.ebuild b/dev-python/xcffib/xcffib-0.1.10.ebuild
index c6b3272ff39b..b0f9e0166692 100644
--- a/dev-python/xcffib/xcffib-0.1.10.ebuild
+++ b/dev-python/xcffib/xcffib-0.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xcffib/xcffib-0.1.10.ebuild,v 1.2 2015/03/06 22:42:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xcffib/xcffib-0.1.10.ebuild,v 1.3 2015/03/09 00:02:37 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ HOMEPAGE="http://github.com/tych0/xcffib"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="x11-libs/libxcb"
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.6.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.6.4.ebuild
index 9bb3b5a6fdd1..9a9385a2f766 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.6.4.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlsxwriter/xlsxwriter-0.6.4.ebuild,v 1.2 2015/03/06 22:43:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlsxwriter/xlsxwriter-0.6.4.ebuild,v 1.3 2015/03/09 00:02:42 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild
index 72aa82b71e87..de2e9e1651ce 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild,v 1.3 2015/03/06 22:43:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild,v 1.4 2015/03/09 00:02:46 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="x11-base/xorg-server[xvfb]"
diff --git a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
index 9990149ff05a..e0ba98e9e862 100644
--- a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
+++ b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild,v 1.4 2015/03/06 22:43:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild,v 1.5 2015/03/09 00:02:50 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/yolk/yolk-0.4.3-r1.ebuild b/dev-python/yolk/yolk-0.4.3-r1.ebuild
index 82b0647bcd54..ef8265a5df6e 100644
--- a/dev-python/yolk/yolk-0.4.3-r1.ebuild
+++ b/dev-python/yolk/yolk-0.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/yolk-0.4.3-r1.ebuild,v 1.4 2015/03/06 22:43:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/yolk-0.4.3-r1.ebuild,v 1.5 2015/03/09 00:02:54 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild
index a38594c49a2d..320718736646 100644
--- a/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild,v 1.5 2015/01/31 17:13:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bsearch/bsearch-1.5.0-r1.ebuild,v 1.6 2015/03/09 06:20:44 graaff Exp $
 
 EAPI=5
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="doc/*"
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby19 ruby20"
 
 inherit ruby-fakegem
 DESCRIPTION="A binary search library for Ruby"
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..e5b2ef17dcf3
--- /dev/null
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild,v 1.1 2015/03/09 06:20:44 graaff Exp $
+
+EAPI=5
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="doc/*"
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit ruby-fakegem
+DESCRIPTION="A binary search library for Ruby"
+HOMEPAGE="http://0xcc.net/ruby-bsearch/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i 's/ruby/\$\{RUBY\}/' test/test.sh || die
+}
+
+each_ruby_test() {
+	pushd test
+	RUBY=${RUBY} sh test.sh || die
+	popd
+}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index 67342db7412f..9ba3ba968557 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,3 +1,3 @@
 DIST bson-2.3.0.tar.gz 48880 SHA256 ea0d7f285926c176239fad0f2cd45e6c40981e2abb665f666cfa1137138604c9 SHA512 8b22e139f06c07cf26905ef8bc5ac7f039c9b0440015c2ab1035a0e402598c826c0be4c31e68a4894b350e405602c99df8c65b45af83f89b5507e965e6bf2e7d WHIRLPOOL a3fc514da88c5a0d9c55019367d243a403889e6119892f9ec70f844ecbc90bc345f3a5a5913248f7441b9910584714beb061dab61c904b573a50896392849e7d
-DIST mongo-ruby-driver-1.12.0.tar.gz 360691 SHA256 33a58080b80cca03255934aea3641084042a0b5ef042b0967aa74d13f334418d SHA512 a5358810aeaddb0eff295e408a739ee4cba3473ae6f877c101c059d9dfb348bc4698ca2c7564049a3820d634792ee600e463e7b894cc82b3baa666dbd0dbf1b2 WHIRLPOOL 175d9049f50efc6afa5a684c9f632a5fb0e7e15d1d3b56ecad2fba3cc070b2c008be1eb3bafdaa2126249417df76d93faff6d8172ca95779bf60978358885aa5
+DIST mongo-ruby-driver-1.12.0.tar.gz 360669 SHA256 84c87d26601c9bd91a6604bcb3630be50d239e471542f9b0a68379705dd03e11 SHA512 725110c527867379def85fde50b6825e94a320356f062e4403d9d55c223f2503676f83ae42916d6ab45afd90d30b2a4272519e070c4af2095c0965297fd72bb6 WHIRLPOOL c152aa579a0535707909560cc73fc878521aac95c034ec71bca6c2397754b5e057c1e7ca32f6b2b3393ce975f122e65926820cdde29aa5f5734fb9717bd980e0
 DIST mongo-ruby-driver-1.6.2.tar.gz 15485515 SHA256 ef6885ba66fce2df619d5543ef1699b584362fe37931e9e2121d974a67cb4a58 SHA512 ce537f2b819c072fddcb12dac66d81e9dc23a739b43211b65239d3264be9d4ac586813a18ca674abf75078639e3ee22dced8e88061e7c263b2381ea0d4e97b28 WHIRLPOOL ceb3ad9cb7b5cd1372d27a7962b60242166a37d31320e54f28c51b5f18e3a53cc08194dc2ec293c953a12a0936b1d8869f9338f4ca3a84fa09a847558acc361e
diff --git a/dev-ruby/bson/bson-1.12.0.ebuild b/dev-ruby/bson/bson-1.12.0.ebuild
index f4c40aa773ce..046eec92d184 100644
--- a/dev-ruby/bson/bson-1.12.0.ebuild
+++ b/dev-ruby/bson/bson-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.12.0.ebuild,v 1.1 2015/03/08 08:08:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.12.0.ebuild,v 1.2 2015/03/09 18:21:25 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -13,13 +13,13 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 GITHUB_USER="mongodb"
 GITHUB_PROJECT="mongo-ruby-driver"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
+RUBY_S="${GITHUB_PROJECT}-${PV}"
 
 inherit multilib ruby-fakegem
 
 DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
 HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="0"
diff --git a/dev-ruby/cocaine/Manifest b/dev-ruby/cocaine/Manifest
index 3f15fbfdbfaf..e29a636a8dfa 100644
--- a/dev-ruby/cocaine/Manifest
+++ b/dev-ruby/cocaine/Manifest
@@ -1,2 +1 @@
-DIST cocaine-0.5.4.gem 15872 SHA256 6bab45a32171e3473160edcd676cd151e63719d0bb50267badd0962931081d00 SHA512 70b410cca904d485b1289980e8436e2eab5d68264e1f4ca01404668d74ba818b3fd7e909ff1c90bd92ad2da98e1fd5c97c8d82c4010dc433570429f5dd2b80f0 WHIRLPOOL b1bedac4fc9a0282a99d8279b8a13bb8a73a2d41f56e402ffcff71eb4fd69058de90addcc3098235d580fbfe05bede71cb8ac8f3f15786c11831a3d0fb656c46
 DIST cocaine-0.5.5.gem 16384 SHA256 637de9fc749bf8e55b032155d3d93ecfe30c7c65e958b467324c25c7d4239660 SHA512 d678a823e610b39fac934584466b7f231ee27387323c953206c09a16ce309d58b941e7750cf5666851dff8f93863c10eae524e725aa6c92e11c70dcc44480a10 WHIRLPOOL ff6a31ca7cdb474902ee7d2a7c4d2aea546b411072509dbab90ecdcfbf6b0fe623ee4a0cba7c685f3898116da25bc35adb4084ffd2e9c2f494cb5ae2b5c4b926
diff --git a/dev-ruby/cocaine/cocaine-0.5.4-r1.ebuild b/dev-ruby/cocaine/cocaine-0.5.4-r1.ebuild
deleted file mode 100644
index 13c957af799c..000000000000
--- a/dev-ruby/cocaine/cocaine-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cocaine/cocaine-0.5.4-r1.ebuild,v 1.1 2014/12/02 23:38:37 p8952 Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small library for doing command lines"
-HOMEPAGE="http://www.thoughtbot.com/projects/cocaine"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/climate_control:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/activesupport-3  <dev-ruby/activesupport-5
-		dev-ruby/bourne
-		<dev-ruby/mocha-1.0.0
-		dev-ruby/posix-spawn
-	)"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	rm Gemfile* || die
-
-	sed -i -e '/bundler/d' Rakefile || die
-
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-
-	# BufferedLogger is deprecated in activesupport-4.0, and removed in 4.1
-	# Require active_support not active_support/buffered_logger.
-	sed -i -e 's/\/buffered_logger//g' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/cocaine/cocaine-0.5.4.ebuild b/dev-ruby/cocaine/cocaine-0.5.4.ebuild
deleted file mode 100644
index 0e57583044bc..000000000000
--- a/dev-ruby/cocaine/cocaine-0.5.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cocaine/cocaine-0.5.4.ebuild,v 1.1 2014/03/31 01:17:12 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small library for doing command lines"
-HOMEPAGE="http://www.thoughtbot.com/projects/cocaine"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/climate_control:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/activesupport-3  <dev-ruby/activesupport-5
-		dev-ruby/bourne
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	rm Gemfile* || die
-
-	sed -i -e '/bundler/d' Rakefile || die
-
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/coffee-rails/Manifest b/dev-ruby/coffee-rails/Manifest
index d1d42eec247f..0430cad06f96 100644
--- a/dev-ruby/coffee-rails/Manifest
+++ b/dev-ruby/coffee-rails/Manifest
@@ -1,4 +1,3 @@
 DIST coffee-rails-3.2.2.gem 7168 SHA256 75f06d71060999044fbc6ac199b91f1fc0bd075d8dd8acde04e02431396b463a SHA512 b4c6a6d0658f50fcd7632260bbddb25e619a9dfb45c0bab8fd60cbfaf32480875fc4b90bd0e77eef5cf25b84b1de08b1bf335454b2c828340ea20a0986373244 WHIRLPOOL 629fde6c30f1288146284dff0b53e2cc6f5469a8c51a625628435b88bf7e9087352da1a7bf5711b4496c92084272aebfa254ddd41b009157646f062738cc3d95
-DIST coffee-rails-4.0.0.gem 8704 SHA256 0bdc9af067458446ccb64c4840d85dbf3e058b0775560f477c34d09528cbbd4f SHA512 8e6b0d69f31936860be2343fc326e7a4c03cbb32b09e3817185ebd1f34e7b67478b86d2f8febac57e9480709c5cc551112afd9b26c87bd81a051fd3b1a011ec1 WHIRLPOOL ac0e1e136118bd4c76bdac76e0fd9d20df0a2e076a6af61a024031f7e41c6bfc9fc7a5f734000e4ea3381fa9a97f942d0b12ab6cf96d3637f59e02f9cff500fb
 DIST coffee-rails-4.0.1.gem 9216 SHA256 2f6e36f2c7a2b5ea4ba2aae5d8f70b443e47f010e1f645aec28368d783e1d88a SHA512 33a4efc0350977ede05e869ceed0cc5c9902d2f75ade6c84fada2d1265323af4798ffe0f0994d0d7b4a7bbb7e48c7360e04c729bc117c7d4448c986f238fdbae WHIRLPOOL c1a5b1890648df1229d474cc9e33dbfcc339971ea6ca3b3cf584fd055b4ce1bb2a6cf33119499aab1715f6b5b2ddd7855467da2b31e718edab480644f045f7bb
 DIST coffee-rails-4.1.0.gem 9216 SHA256 1adbc3d1e3e4d835643e7848b3279a7a1deadd8711be6a41bac1eb4788867f5c SHA512 b3aeaa0d54646cc3ac0b0c6987411b6deb1ed3a432e8cbe489f5be9b1d4558332afba561ff9844b2a74bf09665df063b2d4a08d85bb32c82b7ec8c14a2391fa0 WHIRLPOOL d1ca71933d3e3f9ab2a04ff2197725f6ea2a9f7079897f9e29c85f6094322234db4f844e1e814d5c858f04d6cf3dea6169069be6a5f16ce0611ce48e31dcd4da
diff --git a/dev-ruby/coffee-rails/coffee-rails-4.0.0.ebuild b/dev-ruby/coffee-rails/coffee-rails-4.0.0.ebuild
deleted file mode 100644
index 098826f39e2e..000000000000
--- a/dev-ruby/coffee-rails/coffee-rails-4.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coffee-rails/coffee-rails-4.0.0.ebuild,v 1.4 2014/08/05 16:00:47 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
-HOMEPAGE="https://github.com/rails/coffee-rails"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
-	=dev-ruby/railties-4*"
-
-all_ruby_prepare() {
-	# Avoid dependency on git.
-	sed -i -e 's/git ls-files/echo/' Rakefile || die
-
-	# Make sure a consistent rails version is loaded.
-	sed -i -e '4igem "rails"' test/test_helper.rb || die
-}
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 993f01aa4c9d..e8eab9984d9f 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,2 +1,3 @@
 DIST daemons-1.1.8.gem 32768 SHA256 d2a29058ef21a67db413bbc365d91c9d827bcd8ee3186eb2edacc723aff0cb54 SHA512 01e2c47bb6a66d4a9be29a7789548cb6c914ec89f6bd3b7b24ef03957ef6695c1c5e279ec49b5336e08674399fb97ae9f0ef3e1a0ced792b6b736d19f2d6b002 WHIRLPOOL 991568c6fac60c3ce64a1f9247753ba4cedee44ceef26b103370a9d1f7d33fdce54f20e8b13f3c6eb0d48ff168ab8f204e2a3adc74c41f4d6b746c5025d498f1
 DIST daemons-1.1.9.gem 32768 SHA256 fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8 SHA512 7f29162c7cb728ae27dbd16a9bc5191bb617b6cfacd1c698d2bbe43d335224b1ad59eea36205331abb9b3586c454e584333c6464f5afc033c48e676db6983f45 WHIRLPOOL 9335fde9642212f499449da75ae664443647f7a03622e75b8e71151b5db9d054ebb3d7c499ef734abb6b313543b5a6563a53412a7d2efdf5c2a3460703878e64
+DIST daemons-1.2.0.gem 22528 SHA256 df65d07bf21ec624272964d1fa4b830530a6e7a6739c8d1d396292b3ed9160ad SHA512 976b17f7277a2dd6cbd5cc3ac02638c9ff3b11598a5ef6afffda40a6e0da1a307b8a28c08e90e03966ffbf7faad9ba7a6b1d30edf3fef026c73e75579b2e9237 WHIRLPOOL c81fbbcd5bbf7bfa65640adce57615426c81fb379594bd5b8d670d038a28e3abb51297def10f2474926bbf5f85664d3a11b4688e275377a97d2ee4259232323d
diff --git a/dev-ruby/daemons/daemons-1.2.0.ebuild b/dev-ruby/daemons/daemons-1.2.0.ebuild
new file mode 100644
index 000000000000..0101abac8fe9
--- /dev/null
+++ b/dev-ruby/daemons/daemons-1.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemons/daemons-1.2.0.ebuild,v 1.1 2015/03/09 06:14:55 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="Releases README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
+HOMEPAGE="https://github.com/thuehlinger/daemons"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	use examples || return
+
+	insinto /usr/share/doc/${PF}/
+	doins -r examples
+}
diff --git a/dev-ruby/dbf/dbf-2.0.8.ebuild b/dev-ruby/dbf/dbf-2.0.8.ebuild
index eaaf45377b7d..c01d22442808 100644
--- a/dev-ruby/dbf/dbf-2.0.8.ebuild
+++ b/dev-ruby/dbf/dbf-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbf/dbf-2.0.8.ebuild,v 1.2 2015/03/06 06:30:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbf/dbf-2.0.8.ebuild,v 1.3 2015/03/09 11:45:41 ago Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/infused/dbf"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mongo/Manifest b/dev-ruby/mongo/Manifest
index 9a37600906e4..51ea586f2d15 100644
--- a/dev-ruby/mongo/Manifest
+++ b/dev-ruby/mongo/Manifest
@@ -1,2 +1,2 @@
-DIST mongo-ruby-driver-1.12.0.tar.gz 360691 SHA256 33a58080b80cca03255934aea3641084042a0b5ef042b0967aa74d13f334418d SHA512 a5358810aeaddb0eff295e408a739ee4cba3473ae6f877c101c059d9dfb348bc4698ca2c7564049a3820d634792ee600e463e7b894cc82b3baa666dbd0dbf1b2 WHIRLPOOL 175d9049f50efc6afa5a684c9f632a5fb0e7e15d1d3b56ecad2fba3cc070b2c008be1eb3bafdaa2126249417df76d93faff6d8172ca95779bf60978358885aa5
+DIST mongo-ruby-driver-1.12.0.tar.gz 360669 SHA256 84c87d26601c9bd91a6604bcb3630be50d239e471542f9b0a68379705dd03e11 SHA512 725110c527867379def85fde50b6825e94a320356f062e4403d9d55c223f2503676f83ae42916d6ab45afd90d30b2a4272519e070c4af2095c0965297fd72bb6 WHIRLPOOL c152aa579a0535707909560cc73fc878521aac95c034ec71bca6c2397754b5e057c1e7ca32f6b2b3393ce975f122e65926820cdde29aa5f5734fb9717bd980e0
 DIST mongo-ruby-driver-1.6.2.tar.gz 15485515 SHA256 ef6885ba66fce2df619d5543ef1699b584362fe37931e9e2121d974a67cb4a58 SHA512 ce537f2b819c072fddcb12dac66d81e9dc23a739b43211b65239d3264be9d4ac586813a18ca674abf75078639e3ee22dced8e88061e7c263b2381ea0d4e97b28 WHIRLPOOL ceb3ad9cb7b5cd1372d27a7962b60242166a37d31320e54f28c51b5f18e3a53cc08194dc2ec293c953a12a0936b1d8869f9338f4ca3a84fa09a847558acc361e
diff --git a/dev-ruby/mongo/mongo-1.12.0.ebuild b/dev-ruby/mongo/mongo-1.12.0.ebuild
index db1e22d99f5e..8fea397e4389 100644
--- a/dev-ruby/mongo/mongo-1.12.0.ebuild
+++ b/dev-ruby/mongo/mongo-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongo/mongo-1.12.0.ebuild,v 1.1 2015/03/08 08:27:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongo/mongo-1.12.0.ebuild,v 1.2 2015/03/09 18:25:41 graaff Exp $
 
 EAPI=5
 
@@ -15,13 +15,13 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 GITHUB_USER="mongodb"
 GITHUB_PROJECT="mongo-ruby-driver"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
+RUBY_S="${GITHUB_PROJECT}-${PV}"
 
 inherit ruby-fakegem
 
 DESCRIPTION="A Ruby driver for MongoDB"
 HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="0"
diff --git a/dev-tcltk/anigif/anigif-1.3-r1.ebuild b/dev-tcltk/anigif/anigif-1.3-r1.ebuild
new file mode 100644
index 000000000000..de201cf57ccd
--- /dev/null
+++ b/dev-tcltk/anigif/anigif-1.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/anigif/anigif-1.3-r1.ebuild,v 1.1 2015/03/09 13:21:28 jlec Exp $
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Image rotation package"
+HOMEPAGE="http://cardtable.sourceforge.net/tcltk/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.zip"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/tcl"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *
+}
diff --git a/dev-tcltk/anigif/metadata.xml b/dev-tcltk/anigif/metadata.xml
index dc06c49f3397..4a00a64b40ae 100644
--- a/dev-tcltk/anigif/metadata.xml
+++ b/dev-tcltk/anigif/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>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/bwidget/bwidget-1.9.7.ebuild b/dev-tcltk/bwidget/bwidget-1.9.7.ebuild
index b3521b335583..d97495667888 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.7.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.9.7.ebuild,v 1.2 2015/03/07 10:18:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.9.7.ebuild,v 1.3 2015/03/09 11:45:51 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/tcllib/${P}.zip"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="dev-lang/tk"
diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest
index 6ab16812b83d..9a8124bef66a 100644
--- a/dev-util/fatrace/Manifest
+++ b/dev-util/fatrace/Manifest
@@ -1,2 +1,3 @@
 DIST fatrace-0.4.tar.bz2 18155 SHA256 8abd5d382610e3284f4057dc202f565ff653a5432f3bbc65463be61647e2ef94 SHA512 bd2e31a16f79127294a9599094c41043a612609241653f33fdb8adef17da99a781b5029f6b1af1731b7c939e7ae3c1d2c19f985dde72c9f409e6945d4dc1f7ce WHIRLPOOL c28337e5ca3d14b045704bb23ce386034c5a71559f8ed1a5bb471b4f4202af87088120d7e8e3de76ceae1d860b47179aceead09f277297895753c75ebfc2186e
 DIST fatrace-0.5.tar.bz2 18310 SHA256 de7e04df5650d84da9b1cecd60b0f1dade50adf7cff57835a8617bc94f2becf0 SHA512 e0357e6e74683f4d6ffaa958a704bca996823406a77b92c36537ff2bb4a47b39dd909186b0f0a5cb46672bf48d0ba64c07288d9a1f7fc83bc3928bce5bf91b2d WHIRLPOOL 0bf8ddf1370e9ab95945ed4a5df5f37c3c81e3cff7f22b05f23a86ec48507dc16541e30f58871f426624877df8afafaec3f925ed010745ef0313647bb7134efc
+DIST fatrace-0.9.tar.bz2 18828 SHA256 c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd SHA512 a1dbc17e1e408ddfc145e8f70580b0f5ce500fb53736d6a22547c370c4b221b362973c19a40df3c2dd911c899d74e9dc944a881eea99f9d143f6de7e213146c3 WHIRLPOOL d9b8e05cd32a9fe3904b2f1ba41ddff3e70e44610ae0f05940bb70aa54f40ed5cf6890fd6abd7b5eb4b8015a209c77e49dee6919e7afe3875a32f17f25f4ae53
diff --git a/dev-util/fatrace/fatrace-0.9.ebuild b/dev-util/fatrace/fatrace-0.9.ebuild
new file mode 100644
index 000000000000..e0b2084e281c
--- /dev/null
+++ b/dev-util/fatrace/fatrace-0.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fatrace/fatrace-0.9.ebuild,v 1.1 2015/03/09 15:36:08 monsieurp Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+
+inherit linux-info python-r1 toolchain-funcs
+
+DESCRIPTION="report file access events from all running processes"
+HOMEPAGE="https://launchpad.net/fatrace"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="powertop"
+
+RDEPEND="powertop? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="powertop? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~FANOTIFY"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin fatrace
+	use powertop && dosbin power-usage-report
+
+	doman fatrace.1
+	dodoc NEWS
+}
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
new file mode 100644
index 000000000000..f02465c442bc
--- /dev/null
+++ b/dev-vcs/notify-webhook/Manifest
@@ -0,0 +1,3 @@
+DIST notify-webhook-20140805.tar.gz 15078 SHA256 479d71c7ab9ba772a0b621638e80a14cbe6f34e8fbe851d8db93b118d4567e3f SHA512 8e10994ad26d6de86e7930a2299a8701bed0f04299f2ca14b070f00543368015628b89fd4cbf351f3e42e85cf98e7465dd94517243d1beb71b645d91a637e6d2 WHIRLPOOL 533e2118941edc2f9db4412477a76332fe27475ebc882eb8f567d39a846bf04c95cc693230ae32bc1c10bf24301117b7d6e04c08e45e0fe7cf181fe454504a4b
+DIST notify-webhook-20150308-1ff3985...BCLibCoop:ee038b5.patch 8581 SHA256 c6167fd81e88fcb8de6c37bb2c5259f1c09e6e3a7f0b61d6b58f5f5e478e585c SHA512 c72b03cbea34884c089968e67b61e654a9d365e6b2a338363b6405ab1950aaa5a1c4f8ece73181003571a88f1983458c2e9194d6b26aa103c95c1ceed8e0dd4c WHIRLPOOL 3f4be9d58f5d1a4dff2a7978d067afb0e8fb739b6836709964dec17cc386890eb1d97b0652323acaefc7ca5bc5ae25c46f1f222323d471529e92a5640541bcae
+DIST notify-webhook-20150308.tar.gz 16347 SHA256 cb9d2687eea5ab4f32f6fbc9bdb05a24c8b7755193b312a574172f6aaaca857e SHA512 7a82418d16e6cfd58b9bccaf1700c5a9258601a45a823f1b8307ee3b3c6e90ad52424421836468e34b400b07100a291fd514450a2e1b3c2d1c8dff99ee409557 WHIRLPOOL 523578237483d74d2bd4fa9f4f87277b9103c67c415fbb383629211ea91403fc11debfed70fa94069e9bd8e87a1c9e799929aa1c376244e1a2dde656609a10d8
diff --git a/dev-vcs/notify-webhook/metadata.xml b/dev-vcs/notify-webhook/metadata.xml
new file mode 100644
index 000000000000..be611320454c
--- /dev/null
+++ b/dev-vcs/notify-webhook/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>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+	notify-webhook is a git post-receive hook script that posts JSON data to a
+	webhook capable server.
+
+	This implements the GitHub Web hooks API as closely as possible. It allows
+	arbitrary git repositories to use webhook capable services.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild b/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild
new file mode 100644
index 000000000000..7fc26e1edaa2
--- /dev/null
+++ b/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild,v 1.1 2015/03/09 00:51:59 robbat2 Exp $
+
+EAPI=5
+
+DESCRIPTION="Git post-receive web hook notifier in Python."
+HOMEPAGE="https://github.com/metajack/notify-webhook"
+COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6'
+SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/simplejson"
+RDEPEND="${DEPEND}"
+
+MY_P="${PN}-${COMMIT}"
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dodoc *markdown
+	exeinto /usr/libexec/githook/$PN/
+	doexe notify-webhook.py
+}
diff --git a/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild b/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild
new file mode 100644
index 000000000000..630733c37174
--- /dev/null
+++ b/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild,v 1.2 2015/03/09 05:35:40 patrick Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Git post-receive web hook notifier in Python."
+HOMEPAGE="https://github.com/metajack/notify-webhook"
+COMMIT='1ff39853e59bb0ee37c4783da8dcf3ea14cef53f'
+PATCH_COMMIT='BCLibCoop:ee038b53a48e70d9e69c86386c39b7f24736d07e'
+PATCH_DELTA="${COMMIT:0:7}...${PATCH_COMMIT:0:17}"
+PATCH_NAME="${P}-${PATCH_DELTA}.patch"
+SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/metajack/notify-webhook/compare/${PATCH_DELTA}.patch -> ${PATCH_NAME}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/simplejson"
+DEPEND="${RDEPEND}
+		dev-util/patchutils"
+
+MY_P="${PN}-${COMMIT}"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+# Yes, this is some creative patch mangling, to avoid a manually created
+# distfile. epatch's dryrun fails on a sequence of changes that depend on each
+# other, so we can clean up the patch to actually pass that check.
+src_prepare() {
+	cd "${T}"
+	cp "${DISTDIR}/${PATCH_NAME}" diff
+	p="newdiff"
+	>$p # Make an empty file to work in
+	splitdiff -a -p 1 diff # split out the patches
+	# combine them to a single patch
+	for f in diff.part*.patch ; do
+		combinediff -p 1 $p $f >$p.new && mv $p.new $p
+	done
+
+	# Now apply it, and dry-run will pass too!
+	cd "${S}"
+	EPATCH_OPTS="-p1" epatch "${T}"/newdiff
+}
+
+src_install() {
+	dodoc *markdown
+	exeinto /usr/libexec/githook/$PN/
+	doexe notify-webhook.py
+}
diff --git a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild b/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
index 1a67adb1440e..6019a10b57c9 100644
--- a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
+++ b/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/descent1-demodata-1.4.ebuild,v 1.7 2015/02/06 10:55:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent1-demodata/descent1-demodata-1.4.ebuild,v 1.8 2015/03/09 11:45:36 ago Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -18,7 +18,7 @@ SRC_URI="http://icculus.org/d2x/data/${DEMO}
 LICENSE="free-noncomm"
 
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-action/teeworlds/teeworlds-0.6.3.ebuild b/games-action/teeworlds/teeworlds-0.6.3.ebuild
index ba014c5c2939..0b7170c5ec40 100644
--- a/games-action/teeworlds/teeworlds-0.6.3.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.3.ebuild,v 1.1 2015/01/06 09:27:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.3.ebuild,v 1.2 2015/03/09 11:44:56 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug dedicated"
 
 RDEPEND="
diff --git a/games-arcade/cob/cob-0.9.ebuild b/games-arcade/cob/cob-0.9.ebuild
index 21ffe63dc91b..3ed44645e1fc 100644
--- a/games-arcade/cob/cob-0.9.ebuild
+++ b/games-arcade/cob/cob-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/cob/cob-0.9.ebuild,v 1.15 2015/02/05 21:58:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/cob/cob-0.9.ebuild,v 1.16 2015/03/09 11:45:06 ago Exp $
 
 EAPI=5
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,sound,video]"
diff --git a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild b/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
index 94f199bb1c45..25ad136b4722 100644
--- a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
+++ b/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild,v 1.8 2015/02/05 20:30:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild,v 1.9 2015/03/09 11:45:11 ago Exp $
 
 EAPI=5
 inherit eutils games
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/io${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-board/freedoko/freedoko-0.7.13.ebuild b/games-board/freedoko/freedoko-0.7.13.ebuild
index ad946824ac9d..0006a2af6fd5 100644
--- a/games-board/freedoko/freedoko-0.7.13.ebuild
+++ b/games-board/freedoko/freedoko-0.7.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.13.ebuild,v 1.1 2015/01/29 20:35:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.13.ebuild,v 1.2 2015/03/09 11:45:16 ago Exp $
 
 EAPI=5
 inherit eutils gnome2-utils games
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
 
 RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
diff --git a/games-emulation/yabause/Manifest b/games-emulation/yabause/Manifest
index 40768a92b91c..e023018aa5fd 100644
--- a/games-emulation/yabause/Manifest
+++ b/games-emulation/yabause/Manifest
@@ -1,3 +1,2 @@
 DIST yabause-0.9.10.tar.gz 1376089 SHA256 2f15ea32d4d1226fd1bebf6b107ae9faa71fe230608f01a5b0105c2b2faa78be SHA512 8719d9060de9b899bcda88ace4436b680dc88e061da66be007cacef53e15740ec743c9fb3a0ad7c76c4b628d12ea7d03fc9a4bf51eb3ade2777cfb40389819c5 WHIRLPOOL 09327f899cf616d354545d507481e6a1a1692c74a875a4bab314e7ede782cc6af76fbd512d95204979437fd1325c7fa90b868e2751566178f7d9d472997644c4
-DIST yabause-0.9.12.tar.gz 2199145 SHA256 f45c9649c379e1e790856f8dfa37d93be5638e8f697319b241951316f817bfb1 SHA512 2059f1d2c4a1d0074b35d0ce6bfe8c944543cb6b759c8679ba33045c23d9d90049f90b3f3cde5dde6c62f2e3fcdfad8ba27d6cb5d8ac7d16399ff23797779043 WHIRLPOOL 0585ae4ac19e2d019512d09a2d930a9c6501ac8b0711b526f4a10ca14f600e9f697080fcc376b77d86b3fc858178ae87553a2631bfd7fd819d9453bb71ccc453
 DIST yabause-0.9.14.tar.gz 1662762 SHA256 75e6320873ef6f8ec956568bff5a8f3b67500bdf52a7e0aa88e0a554b2dd775a SHA512 8b14d9146cf12d104fcf43369cd949f1f47e7891a54241914f6141facf871bcc158f4e80a8c5b61fdeefe6f1b8d425ff301ba653df134a030c323c9e3ccf3a58 WHIRLPOOL 637b5be9e889bb59e0ff3e78163b19256b8b6a7cd3b7c03e5922989c0fbdf7721293eb1673d3ead0334c7132ae095ebd067e95373b33a036b7c65c8108823260
diff --git a/games-emulation/yabause/files/yabause-0.9.12-RWX.patch b/games-emulation/yabause/files/yabause-0.9.12-RWX.patch
deleted file mode 100644
index 1a8d3a66db16..000000000000
--- a/games-emulation/yabause/files/yabause-0.9.12-RWX.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
-
---- src/sh2_dynarec/linkage_x64.s
-+++ src/sh2_dynarec/linkage_x64.s
-@@ -747,3 +747,7 @@
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- src/sh2_dynarec/linkage_x86.s
-+++ src/sh2_dynarec/linkage_x86.s
-@@ -743,3 +743,7 @@
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-emulation/yabause/files/yabause-0.9.12-cmake.patch b/games-emulation/yabause/files/yabause-0.9.12-cmake.patch
deleted file mode 100644
index 0ed719a70abc..000000000000
--- a/games-emulation/yabause/files/yabause-0.9.12-cmake.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Feb 18 00:04:44 UTC 2013
-Subject: build system
-
-	make bindir translation dir modifiable
-
---- yabause-0.9.12/src/gtk/CMakeLists.txt
-+++ yabause-0.9.12/src/gtk/CMakeLists.txt
-@@ -59,7 +59,10 @@
- yab_port_success(yabause-gtk)
- configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
- 
--install(TARGETS yabause-gtk DESTINATION "bin")
-+# paths
-+set(BINDIR "bin" CACHE STRING "dir to binary")
-+
-+install(TARGETS yabause-gtk DESTINATION ${BINDIR})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
- install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
- install(FILES "yabause.png" DESTINATION "share/pixmaps")
---- yabause-0.9.12/src/qt/CMakeLists.txt
-+++ yabause-0.9.12/src/qt/CMakeLists.txt
-@@ -184,6 +184,9 @@
- yab_port_success(yabause-qt)
- configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
- 
-+# paths
-+set(BINDIR "bin" CACHE STRING "dir to binary")
-+
- if (WIN32)
- 	install(TARGETS yabause-qt DESTINATION ".")
- 	if (GLUT_FOUND)
-@@ -208,8 +211,8 @@
- 		install(FILES ${Mingw_Path}/mingwm10.dll DESTINATION ".")
- 	endif ()
- else ()
--	install(TARGETS yabause-qt DESTINATION "bin")
-+	install(TARGETS yabause-qt DESTINATION ${BINDIR})
- 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
- 	install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
- 	install(FILES "resources/icons/yabause.png" DESTINATION "share/pixmaps")
--endif ()
-\ No newline at end of file
-+endif ()
---- yabause-0.9.12/l10n/CMakeLists.txt
-+++ yabause-0.9.12/l10n/CMakeLists.txt
-@@ -2,9 +2,12 @@
- 
- set(LANGS de es fr it lt pt pt_BR sv)
- 
-+# paths
-+set(TRANSDIR "share/yabause/yts" CACHE STRING "dir to translation files")
-+
- if (UNIX AND NOT APPLE)
-     foreach(LANG ${LANGS})
--	    install(FILES "yabause_${LANG}.yts" DESTINATION "share/yabause/yts" RENAME "${LANG}.yts")
-+	    install(FILES "yabause_${LANG}.yts" DESTINATION ${TRANSDIR} RENAME "${LANG}.yts")
-     endforeach()
- elseif (WIN32)
-     foreach(LANG ${LANGS})
diff --git a/games-emulation/yabause/metadata.xml b/games-emulation/yabause/metadata.xml
index cba51a60909e..cad5a2aa1773 100644
--- a/games-emulation/yabause/metadata.xml
+++ b/games-emulation/yabause/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>
-	<use>
-		<flag name="qt4">Use qt4 gui instead of gtk+</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-emulation/yabause/yabause-0.9.12.ebuild b/games-emulation/yabause/yabause-0.9.12.ebuild
deleted file mode 100644
index 4d9c52351eb0..000000000000
--- a/games-emulation/yabause/yabause-0.9.12.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/yabause/yabause-0.9.12.ebuild,v 1.2 2013/03/02 21:15:10 hwoarang Exp $
-
-EAPI=5
-inherit eutils cmake-utils games
-
-DESCRIPTION="A Sega Saturn emulator"
-HOMEPAGE="http://yabause.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="openal opengl qt4 sdl"
-
-RDEPEND="
-	openal? ( media-libs/openal )
-	opengl? (
-		media-libs/freeglut
-		virtual/glu
-		virtual/opengl
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	!qt4? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-	)
-	sdl? ( media-libs/libsdl[opengl?,video] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-RWX.patch \
-		"${FILESDIR}"/${P}-cmake.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINDIR="${GAMES_BINDIR}"
-		-DTRANSDIR="${GAMES_DATADIR}"/${PN}/yts
-		-DYAB_OPTIMIZATION=""
-		$(cmake-utils_use sdl YAB_WANT_SDL)
-		$(cmake-utils_use openal YAB_WANT_OPENAL)
-		$(cmake-utils_use opengl YAB_WANT_OPENGL)
-		-DYAB_PORTS=$(usex qt4 "qt" "gtk")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog GOALS README README.LIN
-	prepgamesdirs
-}
diff --git a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild
index 2cfbf4898ccc..9dcf1eff63b3 100644
--- a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild
+++ b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild,v 1.1 2015/02/03 17:05:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild,v 1.2 2015/03/09 11:45:21 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asymptopia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/games-strategy/freeciv/freeciv-2.4.4.ebuild b/games-strategy/freeciv/freeciv-2.4.4.ebuild
index a992b1b718bc..acf357db5df2 100644
--- a/games-strategy/freeciv/freeciv-2.4.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.4.ebuild,v 1.1 2015/02/05 21:49:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.4.ebuild,v 1.2 2015/03/09 11:44:46 ago Exp $
 
 EAPI=5
 inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls postgres readline sdl +server +sound sqlite"
 
 RDEPEND="app-arch/bzip2
diff --git a/games-strategy/warzone2100/warzone2100-3.1.2.ebuild b/games-strategy/warzone2100/warzone2100-3.1.2.ebuild
index 8125b0e375bc..2d52cf0d0242 100644
--- a/games-strategy/warzone2100/warzone2100-3.1.2.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-3.1.2.ebuild,v 1.1 2015/02/06 17:25:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-3.1.2.ebuild,v 1.2 2015/03/09 11:44:26 ago Exp $
 
 EAPI=5
 inherit autotools toolchain-funcs eutils versionator gnome2-utils games
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
 
 LICENSE="GPL-2 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 # upstream requested debug support
 IUSE="debug nls qt4 videos"
 
diff --git a/games-util/joystick/joystick-1.4.8.ebuild b/games-util/joystick/joystick-1.4.8.ebuild
index c5f8d6f4ff65..88eadae1d0fe 100644
--- a/games-util/joystick/joystick-1.4.8.ebuild
+++ b/games-util/joystick/joystick-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.8.ebuild,v 1.1 2015/02/05 09:59:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.8.ebuild,v 1.2 2015/03/09 11:44:36 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="sdl"
 
 DEPEND="sdl? ( media-libs/libsdl:0[video] )
diff --git a/games-util/wxchtdecoder/wxchtdecoder-1.5a.ebuild b/games-util/wxchtdecoder/wxchtdecoder-1.5a.ebuild
index 5c7c7d114432..8be0bf10b7bf 100644
--- a/games-util/wxchtdecoder/wxchtdecoder-1.5a.ebuild
+++ b/games-util/wxchtdecoder/wxchtdecoder-1.5a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/wxchtdecoder/wxchtdecoder-1.5a.ebuild,v 1.4 2015/02/05 07:09:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/wxchtdecoder/wxchtdecoder-1.5a.ebuild,v 1.5 2015/03/09 11:44:51 ago Exp $
 
 EAPI=5
 WX_GTK_VER="2.8"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="x11-libs/wxGTK:2.8[X]"
diff --git a/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild b/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
index 407f1a4c5541..08155c207310 100644
--- a/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
+++ b/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild,v 1.2 2015/03/07 13:14:15 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild,v 1.3 2015/03/09 11:04:31 yngwin Exp $
 
 EAPI=5
 inherit font
@@ -8,8 +8,8 @@ inherit font
 MY_PN="AnonymousPro"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Monospaced truetype font designed with coding in mind"
-HOMEPAGE="http://www.ms-studio.com/FontSales/anonymouspro.html"
-SRC_URI="http://www.ms-studio.com/FontSales/${MY_P}.zip"
+HOMEPAGE="http://www.marksimonson.com/fonts/view/anonymous-pro"
+SRC_URI="http://www.marksimonson.com/assets/content/fonts/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 9f0c36ff1c2e..554fd6c8059f 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1 +1,2 @@
 DIST ristretto-0.6.3.tar.bz2 499323 SHA256 2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79 SHA512 996ed14ab749efd2df702a87e559711791bad71226e8b097c630e9c425059805ca52523ef68e8757849837e89a59bbb580459cc45b4e207785aedcfbaf733166 WHIRLPOOL 402b1f1747dc47b39bc08772e8169130aea2e1826fb0fe01b5a40bc669d1d3d37bdf7f1a21ef19108f70382c9843cdc66d99ce21b5def3eadb83dd3dd8f356c3
+DIST ristretto-0.8.0.tar.bz2 541473 SHA256 71625324cecda7199acbc95a3ea5132d0dcbf808771e7a209ea2b9503ae4f328 SHA512 067d3e7b5ec4fe3537cc796b94e8b999fc99efdb58c52a2a71160405626a3784caa877724e756b363012dce4719ee534f4ce0c92f2f6f2adaf937da8d5abab99 WHIRLPOOL 85b7dbbf7009b5a100f8fa5302f683df2832d448c5580e94ae8e48cd74ec600b9964b101f774cb9610f63786ffe7f11a779a5a4c333ba4778c058ac2f70d35c9
diff --git a/media-gfx/ristretto/ristretto-0.8.0.ebuild b/media-gfx/ristretto/ristretto-0.8.0.ebuild
new file mode 100644
index 000000000000..8b29dd6a8293
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ristretto/ristretto-0.8.0.ebuild,v 1.1 2015/03/09 18:54:29 mgorny Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A fast and lightweight picture viewer for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/ristretto"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.98:0=
+	>=dev-libs/glib-2.24:2=
+	media-libs/libexif:0=
+	x11-libs/cairo:0=
+	>=x11-libs/gtk+-2.20:2=
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.10:0=
+	>=xfce-base/libxfce4util-4.10:0=
+	>=xfce-base/xfconf-4.10:0="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	XFCONF=(
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS TODO )
+}
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 7e7a75e9a404..12360097f0c0 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,2 +1,3 @@
 DIST libvorbis-1.3.3.tar.xz 1087888 SHA256 834c7d35a5ebf4e7b8ab60b0979f2b7f204ca66ff6829728e9d2a67f15347ebd SHA512 6b579517b9caba293ccf88c8806689076ef9c122e5424c704a81a4c461dbc67147dadee1b9a7a678a75c95ab9ed17b98ac1a5da6e2bcd6f7eab19c17616d529f WHIRLPOOL c571a2ace83dbe78f5b7d12d14bc1caba185d1cda67695ee39f73cb6de6eb372e55377675779024086f3a77ebb3be3f9627b0f329b2f540cc944236715608c65
 DIST libvorbis-1.3.4.tar.xz 1091376 SHA256 2f05497d29195dc23ee952a24ee3973a74e6277569c4c2eca0ec5968e541f372 SHA512 f705c7740bec2dc6584ab8f103491a9d462136e3fa76454bde47e2ba04466b896ef066f7f925ad0a44d4c659c962717bc9099b3cecc20f12270d0ad53369ad53 WHIRLPOOL 4049498a24b8d3fb07ae9b4e2f68878c44aa6bc1d648b9f67bb770d9d1bc80696505c60054f71ea01b83f87c5119239d05ee5fa69fe7de1a2d570b2b2f7d0711
+DIST libvorbis-1.3.5.tar.xz 1193144 SHA256 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 SHA512 f18f32edc43f65fea2dd4133e2828a0ced9e5b0797c4569bd26989fc1409ad599359e7c796bffc082ad36189f9722c7b38837384cea66d217beac8b425299ef8 WHIRLPOOL e179e8b52eadcf19d8b93816778c650a0b595846c5bf9593a9ee8b2e06a702cfee64d8e0c6cd82eb1c48211d7f0f34103ad6855033376eb664b34f73aeb01b62
diff --git a/media-libs/libvorbis/libvorbis-1.3.5.ebuild b/media-libs/libvorbis/libvorbis-1.3.5.ebuild
new file mode 100644
index 000000000000..6a024e4fd1fa
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.3.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.3.5.ebuild,v 1.1 2015/03/09 08:09:15 aballier Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-multilib
+
+DESCRIPTION="The Ogg Vorbis sound file format library"
+HOMEPAGE="http://xiph.org/vorbis"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+src_prepare() {
+	sed -i \
+		-e '/CFLAGS/s:-O20::' \
+		-e '/CFLAGS/s:-mcpu=750::' \
+		configure.ac || die
+
+	# Un-hack docdir redefinition.
+	find -name 'Makefile.am' \
+		-exec sed -i \
+			-e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \
+			{} + || die
+
+	AT_M4DIR="m4" \
+	autotools-multilib_src_prepare
+}
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
index 12d3837c1e7d..e9d060f6c9fd 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild,v 1.1 2015/03/05 19:38:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild,v 1.2 2015/03/09 11:09:27 kensington Exp $
 
 EAPI=5
 
@@ -20,7 +20,9 @@ HOMEPAGE="http://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="qt4 qt5 test"
+IUSE="+qt4 qt5 test"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/media-libs/sdl-flic/Manifest b/media-libs/sdl-flic/Manifest
deleted file mode 100644
index 764ca4a5e08e..000000000000
--- a/media-libs/sdl-flic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SDL_flic-12.tgz 52901 RMD160 34d34769a0e8880329b74e9a99a20d0602dd6aaf SHA1 135e19a2be30999001d66d497a0a501cfc6600bd SHA256 e2b6141a7ec4fa7959957f93cdd189bab800595e1323492c610d630c3763dd05
diff --git a/media-libs/sdl-flic/files/1.2-win32.patch b/media-libs/sdl-flic/files/1.2-win32.patch
deleted file mode 100644
index 1a2cba6347a4..000000000000
--- a/media-libs/sdl-flic/files/1.2-win32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SDL_flic-1.2/SDL_flic.c.orig	2004-12-26 21:40:52.631451512 -0500
-+++ SDL_flic-1.2/SDL_flic.c	2004-12-26 21:41:08.307068456 -0500
-@@ -30,7 +30,9 @@
- #include <SDL_flic.h>
- #include <setjmp.h>
- #include <stdlib.h>
-+#ifdef WIN32
- #include <mem.h>
-+#endif
- 
- /* Library version. */
- #define FLI_MAJOR 1
diff --git a/media-libs/sdl-flic/files/Makefile b/media-libs/sdl-flic/files/Makefile
deleted file mode 100644
index b4f9110ffc2b..000000000000
--- a/media-libs/sdl-flic/files/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-CFLAGS		+= $(shell sdl-config --cflags) -I. -DINLINE=
-LDFLAGS		+= -L.
-LIBS		+= $(shell sdl-config --libs)
-
-LIB_NAME	= libSDL_flic
-LIB_SHARED	= $(LIB_NAME).so
-LIB_STATIC	= $(LIB_NAME).a
-BIN			= playflic
-TARGETS		= $(LIB_SHARED) $(LIB_STATIC) $(BIN)
-
-BINDIR		= /usr/bin
-LIBDIR		= /usr/lib
-INCDIR		= /usr/include
-
-all: $(TARGETS)
-
-SDL_flic.lo: SDL_flic.c
-	$(CC) $(CFLAGS) -fPIC -o $@ -c $<
-$(LIB_SHARED): SDL_flic.lo
-	$(CC) $(CFLAGS) $(LDFLAGS) SDL_flic.lo -shared -Wl,-soname,$@ -o $@.1.0.0 $(LIBS)
-	ln -s $@.1.0.0 $@.1
-	ln -s $@.1 $@
-
-$(LIB_STATIC): SDL_flic.o
-	$(AR) rcs $@ $<
-
-$(BIN): $(LIB_SHARED) playflic.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ playflic.o -lSDL_flic $(LIBS)
-
-install: $(TARGETS)
-	install -d -m 755 $(DESTDIR)/$(LIBDIR)
-	install -m 644 $(LIB_STATIC) $(DESTDIR)/$(LIBDIR)
-	install -m 755 $(LIB_SHARED).1.0.0 $(DESTDIR)/$(LIBDIR)
-	ln -s $(LIB_SHARED).1.0.0 $(DESTDIR)/$(LIBDIR)/$(LIB_SHARED).1
-	ln -s $(LIB_SHARED).1 $(DESTDIR)/$(LIBDIR)/$(LIB_SHARED)
-
-	install -d -m 755 $(DESTDIR)/$(BINDIR)
-	install -m 755 $(BIN) $(DESTDIR)/$(BINDIR)
-
-	install -d -m 755 $(DESTDIR)/$(INCDIR)
-	install -m 644 SDL_flic.h $(DESTDIR)/$(INCDIR)
-
-clean:
-	rm -f libSDL_flic.a libSDL_flic.so*
-	rm -f *.o *.lo
-	rm -f playflic
diff --git a/media-libs/sdl-flic/sdl-flic-1.2.ebuild b/media-libs/sdl-flic/sdl-flic-1.2.ebuild
deleted file mode 100644
index f8c07122aa77..000000000000
--- a/media-libs/sdl-flic/sdl-flic-1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/sdl-flic-1.2.ebuild,v 1.8 2009/12/15 17:57:02 ssuominen Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="FLIC animation file loading library"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="mirror://gentoo/SDL_flic-12.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl"
-
-S=${WORKDIR}/SDL_flic-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-win32.patch"
-	cp "${FILESDIR}/Makefile" .
-	edos2unix SDL_flic.h
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR=/usr/$(get_libdir) \
-		install \
-		|| die "emake install failed"
-	dodoc README.txt
-}
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild
index cc7a92acd6a9..b613d5457e7d 100644
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild,v 1.2 2015/01/29 17:55:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-gfx/sdl2-gfx-1.0.1.ebuild,v 1.3 2015/03/09 11:45:31 ago Exp $
 
 EAPI=5
 inherit autotools eutils multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild
index c0bc1a6875e8..6c105aaea56b 100644
--- a/media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild
+++ b/media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild,v 1.1 2015/03/08 14:12:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/baka-mplayer/baka-mplayer-2.0.2.ebuild,v 1.2 2015/03/09 11:31:03 yngwin Exp $
 
 EAPI=5
 inherit qmake-utils
@@ -20,7 +20,8 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-video/mpv[libmpv]"
+	media-video/mpv[libmpv]
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f902583bd811..c9a820adafeb 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,3 +4,4 @@ DIST ffmpeg-1.2.12.tar.bz2 5974419 SHA256 913ac95c7fad92c2a4ebcfd11850904f531845
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-2.2.13.tar.bz2 7032709 SHA256 80064c03e5fbefba6a5885ea9a090c2d671c17c50978bf087979c4ce9d436aef SHA512 8a09a29b55d8d906e2bf39e9306922d5bf2144f67d86ff8e8a645094a12976657525ac84eacb427a11ef738121ee94ada037629521daf0cc31b4ef9c0fd05cbc WHIRLPOOL da0160efb41e3a597508dd8fcb1ffc4008917a63fd18747e870c546a3fde907cd058219ff82b980d26346fe5dd36fff65e31b87e94351e829a7802897584d22c
 DIST ffmpeg-2.5.4.tar.bz2 7677320 SHA256 cc91c166c2b0ad9aacc533e4d5637912df583b43834c68aeec12ded7e082a286 SHA512 696f9f9b7f8329aaea8fb50ac230edd2f310e185103c190d7fca8940890be9562a8559ebe504d1bf2bc7c0df45020ad80ab6be6d80ddd06747ef76a77287befc WHIRLPOOL 876ecc5aa5499b1d5abd98b37ab309bf101fa975162455cac5a0378e04e424cd288c3cddbae64b2748c4609a2130eee0103cbbb795bd8434ff13739b9c0f4a6a
+DIST ffmpeg-2.6.tar.bz2 7799342 SHA256 23c38ecc0dd6cae5e9a3c5c2c967b10480dc4f7159d094ade13b0775d1fd4791 SHA512 a3b5d69e5ba8b7529ca9f5262d1e403e673f1efb62f3976df5049d0bcbeaab3f3fbc2d4189f37bd02729079bad7ab87413c4fcac86be300c345c161bd8d06181 WHIRLPOOL c0848893613dc77ac5a20d9e6ba4f3631e8d1c10f6829aa931782a01e42fd56b4cad50b667b5f24a359b11c0d831d650385f101cb76340f18ce586186bfc0874
diff --git a/media-video/ffmpeg/ffmpeg-2.6.ebuild b/media-video/ffmpeg/ffmpeg-2.6.ebuild
new file mode 100644
index 000000000000..03e0936fee9d
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.6.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.ebuild,v 1.1 2015/03/09 07:48:27 aballier Exp $
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=54.56.56
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		aac? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
+		+hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
+		libass truetype:libfreetype
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
+	aacplus:libaacplus faac:libfaac theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa +encode examples jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
+MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( net-misc/wget sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	zvbi? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	encode? ( faac? ( bindist ) aacplus? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch_user
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use aac || use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use xcb || ffuse+=( X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 8b106ce1b147..602117821059 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,3 +1,4 @@
 DIST parole-0.5.4.tar.bz2 669806 SHA256 c0f4bd7b45a016a0a84ec86336b912d0a12388e29c316beb86193ed7d2c3bfc3 SHA512 a3be6c35ea7b118d11738dbe460a3cf8daab61d552dabbc7504f5120e86c11eba6b885f45f314e5df22ed8958959e75339423d041be3e8d5128be093941cb5ae WHIRLPOOL 390a26f4fe230c262287389558f9208f004d262157a2d3522124d613af9b117aea6c24f20d1e4a6c51cfe413248687657c389f742dafe5fe2680a9d13fb90a6a
 DIST parole-0.6.1.tar.bz2 678053 SHA256 cdff0006e36b30aa18168a5cb3b6de2e94fe55ccbc4d36c47f4448fd67379c08 SHA512 2d183596b7cd77b6ff7ce04eecd81ec837c1ec235dc9d116e1212df83da111fc9cb378daef5e83e7f55845148e2812454b88b3ed36be21fa7e08e405422cc4c4 WHIRLPOOL bfc6273d3368bf079060d1c4cebcb213c78023588058674760cc6f56219e105564314ca710e2baa8bb344be4b548df24a89f1338b6dfadaad8ab08bcc1b0e773
 DIST parole-0.7.0.tar.bz2 679514 SHA256 91a2cedfa7cc9a0ff39618af05c3757f0a4003a3507e9efe3a48e8a324db3a7c SHA512 bb6516638fba2ed6c592f3fbe6d764e384e8f8d98d10f0888fb5d1e326eaedc4e290b4633cf42949a80abca59282e44d73f7f6690303484eab6caf78efd05445 WHIRLPOOL acf721ae661342ae3ba8d7350124e60f83115e51626e8680833e2157298542347c6d1095896b5495fc228afc269fed401bcd07b4fdb8002a1af3c1d258e45fe4
+DIST parole-0.8.0.tar.bz2 813553 SHA256 2d966aeb426de81d992829e33b3f66185b19fd031a1891968b3a40d6d50239cc SHA512 d8c3d6ee411e8bb05e3b03408da56d80154313e1f4817cdd1d75fb0ae25f2761362255ba55b513d551383f8a2808603dbd4949c847d815c0a41516edeb673afe WHIRLPOOL 239d1b616d1ce7282cf818164276a93c669c54d4682c8cb47fcf6089b1f51eb9a77ef8dfe65423dfaae9eb11c95b37d9b761d47a27ff1a54c4389e61a3a26765
diff --git a/media-video/parole/parole-0.8.0.ebuild b/media-video/parole/parole-0.8.0.ebuild
new file mode 100644
index 000000000000..a7dd56dffa65
--- /dev/null
+++ b/media-video/parole/parole-0.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/parole/parole-0.8.0.ebuild,v 1.1 2015/03/09 18:46:26 mgorny Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/parole/"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="clutter debug libnotify taglib"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.32:2=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	sys-apps/dbus:0=
+	>=x11-libs/gtk+-3.2:3=
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.11:0=
+	>=xfce-base/libxfce4util-4.11:0=
+	>=xfce-base/xfconf-4.10:0=
+	clutter? (
+		>=media-libs/clutter-1.16.4:1.0=
+		>=media-libs/clutter-gtk-1.4.4:1.0=
+		)
+	libnotify? ( >=x11-libs/libnotify-0.7:0= )
+	taglib? ( >=media-libs/taglib-1.6:0= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable clutter)
+		$(use_enable taglib)
+		$(use_enable libnotify notify-plugin)
+		$(xfconf_use_debug)
+		--with-gstreamer=1.0
+		)
+
+	DOCS=( AUTHORS ChangeLog README THANKS TODO )
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4250a731e304..d9de95e55bba 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 21:36:53 +0000
+Mon, 09 Mar 2015 19:06:51 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4250a731e304..d9de95e55bba 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 21:36:53 +0000
+Mon, 09 Mar 2015 19:06:51 +0000
diff --git a/metadata/md5-cache/app-admin/glance-2014.2.2 b/metadata/md5-cache/app-admin/glance-2014.2.2-r1
similarity index 99%
rename from metadata/md5-cache/app-admin/glance-2014.2.2
rename to metadata/md5-cache/app-admin/glance-2014.2.2-r1
index 2b5b76ce8f86..2068dd90015c 100644
--- a/metadata/md5-cache/app-admin/glance-2014.2.2
+++ b/metadata/md5-cache/app-admin/glance-2014.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/glance/juno/2014.2.2/+download/glance-2014.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=15d03d104dcd6fd86df7bf06eac251fa
+_md5_=74646dd07efee1a475e1c4c387daf823
diff --git a/metadata/md5-cache/app-admin/rex-1.0.0 b/metadata/md5-cache/app-admin/rex-1.0.0
new file mode 100644
index 000000000000..815840c16d0e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rex-1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Net-SSH2 dev-perl/JSON-XS dev-perl/XML-Simple dev-perl/Digest-SHA1 dev-perl/Digest-HMAC dev-perl/Expect dev-perl/DBI dev-perl/yaml dev-perl/libwww-perl dev-perl/String-Escape dev-perl/List-MoreUtils dev-perl/Parallel-ForkManager dev-perl/Text-Glob dev-lang/perl:=[-build(-)]
+DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/rex/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Net-SSH2 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.0.0.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=5adf8b6807bf151c93b6e9cdacf564b1
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.3 b/metadata/md5-cache/app-admin/supervisor-3.1.3
index 43d467d1d948..c46dddb1038e 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.3
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=A system for controlling process state under UNIX
 EAPI=5
 HOMEPAGE=http://supervisord.org/ http://pypi.python.org/pypi/supervisor
 IUSE=doc test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze ZPL BSD HPND GPL-2
 RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=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/s/supervisor/supervisor-3.1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=041dd4b2010894e1a668ee56421f0de3
+_md5_=72480bd06dd77f6b57e0f16c99a218ce
diff --git a/metadata/md5-cache/app-editors/mousepad-0.4.0 b/metadata/md5-cache/app-editors/mousepad-0.4.0
new file mode 100644
index 000000000000..6417604dba57
--- /dev/null
+++ b/metadata/md5-cache/app-editors/mousepad-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= ) dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
+EAPI=5
+HOMEPAGE=http://goodies.xfce.org/projects/applications/start
+IUSE=debug dbus gtk3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30:2= dbus? ( >=dev-libs/dbus-glib-0.100:0= ) !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= )
+SLOT=0
+SRC_URI=mirror://xfce/src/apps/mousepad/0.4/mousepad-0.4.0.tar.bz2
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_md5_=3e373cd1b8e6a67961a087d7d23bafc8
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.6 b/metadata/md5-cache/app-emulation/cloud-init-0.7.6
index 54c833684bc4..90d7a84a3847 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-0.7.6
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.6
@@ -4,11 +4,11 @@ DESCRIPTION=EC2 initialisation magic
 EAPI=5
 HOMEPAGE=http://launchpad.net/cloud-init
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/prettytable[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/logger 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=http://launchpad.net/cloud-init/trunk/0.7.6/+download/cloud-init-0.7.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9453c01ed1896d41e211296a95cbb990
+_md5_=ecd5b697c9c5337c0b82531ae21b9e86
diff --git a/metadata/md5-cache/app-misc/yworklog-0.0.7 b/metadata/md5-cache/app-misc/yworklog-0.0.7
index c135f520dd63..4416beec644d 100644
--- a/metadata/md5-cache/app-misc/yworklog-0.0.7
+++ b/metadata/md5-cache/app-misc/yworklog-0.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Stack based utility with CLI interface helping to monitor time spent
 EAPI=5
 HOMEPAGE=https://github.com/yaccz/worklog
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/sqlalchemy dev-python/cement[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/alembic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/y/yworklog/yworklog-0.0.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=739c36c1da587ce70f04d0c979e72f5a
+_md5_=2452691b7ae9c62bb6152909473d9a31
diff --git a/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1 b/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1
index a4ebae16abdf..c3eed5525880 100644
--- a/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1
+++ b/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform Bluetooth API for Python which provides simple access
 EAPI=5
 HOMEPAGE=http://lightblue.sourceforge.net/
 IUSE=examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/openobex-1.3 >=dev-python/pybluez-0.9[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://sourceforge/lightblue/lightblue-0.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fed1b7a8a39b0ea200e6a1bc8bf39174
+_md5_=03a582b49cd5aa4e6697e9c3683f93b5
diff --git a/metadata/md5-cache/app-office/texmaker-4.4.1 b/metadata/md5-cache/app-office/texmaker-4.4.1
index e85c45d4dbcd..f11972d70cee 100644
--- a/metadata/md5-cache/app-office/texmaker-4.4.1
+++ b/metadata/md5-cache/app-office/texmaker-4.4.1
@@ -3,7 +3,7 @@ DEPEND=app-text/hunspell app-text/poppler:=[qt4?,qt5?] sys-libs/zlib x11-libs/li
 DESCRIPTION=A nice LaTeX-IDE
 EAPI=5
 HOMEPAGE=http://www.xm1math.net/texmaker/
-IUSE=qt4 qt5
+IUSE=+qt4 qt5
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-text/hunspell app-text/poppler:=[qt4?,qt5?] sys-libs/zlib x11-libs/libX11 x11-libs/libXext dev-qt/qtsingleapplication[X,qt4?,qt5?] qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtscript:4 dev-qt/qtwebkit:4 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm qt4? ( app-i18n/ibus-qt )
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( qt4 qt5 )
 SLOT=0
 SRC_URI=http://www.xm1math.net/texmaker/texmaker-4.4.1.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=317955b698c8bc884e942404cd3212ca
+_md5_=1256df3828974800411394b3c20ae6f7
diff --git a/metadata/md5-cache/app-office/texstudio-2.9.0 b/metadata/md5-cache/app-office/texstudio-2.9.0
new file mode 100644
index 000000000000..4a17aa6a1754
--- /dev/null
+++ b/metadata/md5-cache/app-office/texstudio-2.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=app-text/hunspell app-text/poppler:=[qt4?,qt5?] >=dev-libs/quazip-0.7.1[qt4?,qt5?] dev-qt/qtsingleapplication[qt4?,qt5?] x11-libs/libX11 x11-libs/libXext qt4? ( dev-qt/designer:4 >=dev-qt/qtgui-4.8.5:4 >=dev-qt/qtcore-4.6.1:4 >=dev-qt/qtscript-4.6.1:4 >=dev-qt/qtsvg-4.6.1:4 >=dev-qt/qttest-4.6.1:4 ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 ) video? ( media-libs/phonon[qt4?,qt5?] ) virtual/pkgconfig
+DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
+EAPI=5
+HOMEPAGE=http://texstudio.sourceforge.net/
+IUSE=video +qt4 qt5
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-text/hunspell app-text/poppler:=[qt4?,qt5?] >=dev-libs/quazip-0.7.1[qt4?,qt5?] dev-qt/qtsingleapplication[qt4?,qt5?] x11-libs/libX11 x11-libs/libXext qt4? ( dev-qt/designer:4 >=dev-qt/qtgui-4.8.5:4 >=dev-qt/qtcore-4.6.1:4 >=dev-qt/qtscript-4.6.1:4 >=dev-qt/qtsvg-4.6.1:4 >=dev-qt/qttest-4.6.1:4 ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 ) video? ( media-libs/phonon[qt4?,qt5?] ) virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm
+REQUIRED_USE=^^ ( qt4 qt5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.9.0/texstudio-2.9.0.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=da1661de7b216416e98390c949ac5390
diff --git a/metadata/md5-cache/app-text/djview-4.8 b/metadata/md5-cache/app-text/djview-4.10
similarity index 88%
rename from metadata/md5-cache/app-text/djview-4.8
rename to metadata/md5-cache/app-text/djview-4.10
index 1ab4b3a2a901..4e3071b19be6 100644
--- a/metadata/md5-cache/app-text/djview-4.8
+++ b/metadata/md5-cache/app-text/djview-4.10
@@ -4,10 +4,10 @@ DESCRIPTION=Portable DjVu viewer using Qt4
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
 IUSE=debug nsplugin
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtgui:4
 SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.8.tar.gz
+SRC_URI=mirror://sourceforge/djvu/djview-4.10.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fb83e15c2a351764a781f88b377e642d
+_md5_=ea150d6fa5b546fbd910d3f57519e7d4
diff --git a/metadata/md5-cache/app-text/djview-4.7 b/metadata/md5-cache/app-text/djview-4.7
deleted file mode 100644
index d6d21c7c5c58..000000000000
--- a/metadata/md5-cache/app-text/djview-4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt4
-EAPI=4
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.7.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a9cf447be09bebfab3831a6207bd7b03
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27 b/metadata/md5-cache/app-text/djvu-3.5.27
new file mode 100644
index 000000000000..b39fc6ba0cd6
--- /dev/null
+++ b/metadata/md5-cache/app-text/djvu-3.5.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape )
+DESCRIPTION=DjVu viewers, encoders and utilities
+EAPI=5
+HOMEPAGE=http://djvu.sourceforge.net/
+IUSE=debug doc jpeg tiff xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.27.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=ce231daff6f7830c844027ddd62c19f7
diff --git a/metadata/md5-cache/app-text/dvipng-1.15 b/metadata/md5-cache/app-text/dvipng-1.15
new file mode 100644
index 000000000000..cfc378826296
--- /dev/null
+++ b/metadata/md5-cache/app-text/dvipng-1.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/kpathsea media-libs/gd[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 ) virtual/texi2dvi test? ( dev-texlive/texlive-fontsrecommended )
+DESCRIPTION=Translate DVI files into PNG or GIF graphics
+EAPI=5
+HOMEPAGE=http://dvipng.sourceforge.net/
+IUSE=truetype test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-3+ Texinfo-manual
+RDEPEND=dev-libs/kpathsea media-libs/gd[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/dvipng/dvipng-1.15.tar.gz
+_md5_=d1e6e62ff5c8ca149cdba8b367ef3bb7
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328 b/metadata/md5-cache/app-text/pdfminer-20140328
index 3622dc643b1c..b9ff9cce2ca3 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328
+++ b/metadata/md5-cache/app-text/pdfminer-20140328
@@ -4,11 +4,11 @@ DESCRIPTION=Python tool for extracting information from PDF documents
 EAPI=5
 HOMEPAGE=http://www.unixuser.org/~euske/python/pdfminer/ http://pypi.python.org/pypi/pdfminer/
 IUSE=doc examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7d560abaf0e6e6850b16f5e9d247abee
+_md5_=e8d6fcf6002cb80300691e5ea8a6d13b
diff --git a/metadata/md5-cache/app-text/pylize-1.3b-r1 b/metadata/md5-cache/app-text/pylize-1.3b-r1
index 5d991848511d..ced165680bfc 100644
--- a/metadata/md5-cache/app-text/pylize-1.3b-r1
+++ b/metadata/md5-cache/app-text/pylize-1.3b-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python HTML Slideshow Generator using HTML and CSS
 EAPI=5
 HOMEPAGE=http://www.chrisarndt.de/en/software/pylize/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.chrisarndt.de/en/software/pylize/download/pylize-1.3b.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=dc94b7845d912c5687cd69ef340f219f
+_md5_=121186f2cd925e9588de6d7bc9106f6c
diff --git a/metadata/md5-cache/app-text/texlive-core-2014-r2 b/metadata/md5-cache/app-text/texlive-core-2014-r2
index 87e05ffe3efb..7fde45cfe760 100644
--- a/metadata/md5-cache/app-text/texlive-core-2014-r2
+++ b/metadata/md5-cache/app-text/texlive-core-2014-r2
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libICE x11-
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20140525-source.tar.xz mirror://gentoo/texlive-core-patches-45.tar.xz mirror://gentoo/texlive-module-tetex-2014.tar.xz mirror://gentoo/texlive-module-hyphen-base-2014.tar.xz mirror://gentoo/texlive-module-texconfig-2014.tar.xz mirror://gentoo/texlive-module-gsftopk-2014.tar.xz mirror://gentoo/texlive-module-texlive.infra-2014.tar.xz mirror://gentoo/texlive-module-a2ping-2014.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2014.tar.xz mirror://gentoo/texlive-module-asymptote-2014.tar.xz mirror://gentoo/texlive-module-bundledoc-2014.tar.xz mirror://gentoo/texlive-module-ctanify-2014.tar.xz mirror://gentoo/texlive-module-ctanupload-2014.tar.xz mirror://gentoo/texlive-module-ctie-2014.tar.xz mirror://gentoo/texlive-module-cweb-2014.tar.xz mirror://gentoo/texlive-module-de-macro-2014.tar.xz mirror://gentoo/texlive-module-dtl-2014.tar.xz mirror://gentoo/texlive-module-dtxgen-2014.tar.xz mirror://gentoo/texlive-module-dvi2tty-2014.tar.xz mirror://gentoo/texlive-module-dviasm-2014.tar.xz mirror://gentoo/texlive-module-dvicopy-2014.tar.xz mirror://gentoo/texlive-module-dvidvi-2014.tar.xz mirror://gentoo/texlive-module-dviljk-2014.tar.xz mirror://gentoo/texlive-module-dvipos-2014.tar.xz mirror://gentoo/texlive-module-findhyph-2014.tar.xz mirror://gentoo/texlive-module-fragmaster-2014.tar.xz mirror://gentoo/texlive-module-hyphenex-2014.tar.xz mirror://gentoo/texlive-module-installfont-2014.tar.xz mirror://gentoo/texlive-module-lacheck-2014.tar.xz mirror://gentoo/texlive-module-latex-git-log-2014.tar.xz mirror://gentoo/texlive-module-latex2man-2014.tar.xz mirror://gentoo/texlive-module-latexfileversion-2014.tar.xz mirror://gentoo/texlive-module-latexpand-2014.tar.xz mirror://gentoo/texlive-module-latexindent-2014.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2014.tar.xz mirror://gentoo/texlive-module-ltximg-2014.tar.xz mirror://gentoo/texlive-module-listings-ext-2014.tar.xz mirror://gentoo/texlive-module-match_parens-2014.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2014.tar.xz mirror://gentoo/texlive-module-patgen-2014.tar.xz mirror://gentoo/texlive-module-pdfcrop-2014.tar.xz mirror://gentoo/texlive-module-pdftools-2014.tar.xz mirror://gentoo/texlive-module-pfarrei-2014.tar.xz mirror://gentoo/texlive-module-pkfix-2014.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2014.tar.xz mirror://gentoo/texlive-module-purifyeps-2014.tar.xz mirror://gentoo/texlive-module-seetexk-2014.tar.xz mirror://gentoo/texlive-module-sty2dtx-2014.tar.xz mirror://gentoo/texlive-module-synctex-2014.tar.xz mirror://gentoo/texlive-module-texcount-2014.tar.xz mirror://gentoo/texlive-module-texdef-2014.tar.xz mirror://gentoo/texlive-module-texdiff-2014.tar.xz mirror://gentoo/texlive-module-texdirflatten-2014.tar.xz mirror://gentoo/texlive-module-texdoc-2014.tar.xz mirror://gentoo/texlive-module-texliveonfly-2014.tar.xz mirror://gentoo/texlive-module-texloganalyser-2014.tar.xz mirror://gentoo/texlive-module-texware-2014.tar.xz mirror://gentoo/texlive-module-tie-2014.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2014.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2014.tar.xz mirror://gentoo/texlive-module-web-2014.tar.xz mirror://gentoo/texlive-module-collection-binextra-2014.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2014.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2014.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2014.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2014.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2014.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2014.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2014.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2014.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2014.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2014.tar.xz mirror://gentoo/texlive-module-ctie.doc-2014.tar.xz mirror://gentoo/texlive-module-cweb.doc-2014.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2014.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2014.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2014.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2014.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2014.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2014.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2014.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2014.tar.xz mirror://gentoo/texlive-module-installfont.doc-2014.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2014.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2014.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2014.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2014.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2014.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2014.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2014.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2014.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2014.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2014.tar.xz mirror://gentoo/texlive-module-patgen.doc-2014.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2014.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2014.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2014.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2014.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2014.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2014.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2014.tar.xz mirror://gentoo/texlive-module-synctex.doc-2014.tar.xz mirror://gentoo/texlive-module-texcount.doc-2014.tar.xz mirror://gentoo/texlive-module-texdef.doc-2014.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2014.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2014.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2014.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2014.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2014.tar.xz mirror://gentoo/texlive-module-texware.doc-2014.tar.xz mirror://gentoo/texlive-module-tie.doc-2014.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2014.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2014.tar.xz mirror://gentoo/texlive-module-web.doc-2014.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2014.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2014.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2014.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2014.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2014.tar.xz mirror://gentoo/texlive-module-texdef.source-2014.tar.xz )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	texlive-common	8bd0f2143e4bb5fa3bb0bb56aa08006f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=581fcfd482d4044e7bd66ab6ace59f0e
+_md5_=6b11ce12695943ae61b2904b19299384
diff --git a/metadata/md5-cache/app-text/texlive-core-2014-r3 b/metadata/md5-cache/app-text/texlive-core-2014-r3
new file mode 100644
index 000000000000..5ec38737313b
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2014-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libXfont ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= app-text/teckit media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.0 cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils
+DESCRIPTION=A complete TeX distribution
+EAPI=5
+HOMEPAGE=http://tug.org/texlive/
+IUSE=cjk X doc source tk xetex
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LPPL-1.3c TeX
+RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libXfont ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= app-text/teckit media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.0 cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 ) >=app-text/ps2pkm-1.5_p20130530 >=app-text/dvipsk-5.993_p20130530 >=dev-tex/bibtexu-3.71_p20130530 virtual/perl-Getopt-Long tk? ( dev-perl/perl-tk )
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20140525-source.tar.xz mirror://gentoo/texlive-core-patches-46.tar.xz mirror://gentoo/texlive-module-tetex-2014.tar.xz mirror://gentoo/texlive-module-hyphen-base-2014.tar.xz mirror://gentoo/texlive-module-texconfig-2014.tar.xz mirror://gentoo/texlive-module-gsftopk-2014.tar.xz mirror://gentoo/texlive-module-texlive.infra-2014.tar.xz mirror://gentoo/texlive-module-a2ping-2014.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2014.tar.xz mirror://gentoo/texlive-module-asymptote-2014.tar.xz mirror://gentoo/texlive-module-bundledoc-2014.tar.xz mirror://gentoo/texlive-module-ctanify-2014.tar.xz mirror://gentoo/texlive-module-ctanupload-2014.tar.xz mirror://gentoo/texlive-module-ctie-2014.tar.xz mirror://gentoo/texlive-module-cweb-2014.tar.xz mirror://gentoo/texlive-module-de-macro-2014.tar.xz mirror://gentoo/texlive-module-dtl-2014.tar.xz mirror://gentoo/texlive-module-dtxgen-2014.tar.xz mirror://gentoo/texlive-module-dvi2tty-2014.tar.xz mirror://gentoo/texlive-module-dviasm-2014.tar.xz mirror://gentoo/texlive-module-dvicopy-2014.tar.xz mirror://gentoo/texlive-module-dvidvi-2014.tar.xz mirror://gentoo/texlive-module-dviljk-2014.tar.xz mirror://gentoo/texlive-module-dvipos-2014.tar.xz mirror://gentoo/texlive-module-findhyph-2014.tar.xz mirror://gentoo/texlive-module-fragmaster-2014.tar.xz mirror://gentoo/texlive-module-hyphenex-2014.tar.xz mirror://gentoo/texlive-module-installfont-2014.tar.xz mirror://gentoo/texlive-module-lacheck-2014.tar.xz mirror://gentoo/texlive-module-latex-git-log-2014.tar.xz mirror://gentoo/texlive-module-latex2man-2014.tar.xz mirror://gentoo/texlive-module-latexfileversion-2014.tar.xz mirror://gentoo/texlive-module-latexpand-2014.tar.xz mirror://gentoo/texlive-module-latexindent-2014.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2014.tar.xz mirror://gentoo/texlive-module-ltximg-2014.tar.xz mirror://gentoo/texlive-module-listings-ext-2014.tar.xz mirror://gentoo/texlive-module-match_parens-2014.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2014.tar.xz mirror://gentoo/texlive-module-patgen-2014.tar.xz mirror://gentoo/texlive-module-pdfcrop-2014.tar.xz mirror://gentoo/texlive-module-pdftools-2014.tar.xz mirror://gentoo/texlive-module-pfarrei-2014.tar.xz mirror://gentoo/texlive-module-pkfix-2014.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2014.tar.xz mirror://gentoo/texlive-module-purifyeps-2014.tar.xz mirror://gentoo/texlive-module-seetexk-2014.tar.xz mirror://gentoo/texlive-module-sty2dtx-2014.tar.xz mirror://gentoo/texlive-module-synctex-2014.tar.xz mirror://gentoo/texlive-module-texcount-2014.tar.xz mirror://gentoo/texlive-module-texdef-2014.tar.xz mirror://gentoo/texlive-module-texdiff-2014.tar.xz mirror://gentoo/texlive-module-texdirflatten-2014.tar.xz mirror://gentoo/texlive-module-texdoc-2014.tar.xz mirror://gentoo/texlive-module-texliveonfly-2014.tar.xz mirror://gentoo/texlive-module-texloganalyser-2014.tar.xz mirror://gentoo/texlive-module-texware-2014.tar.xz mirror://gentoo/texlive-module-tie-2014.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2014.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2014.tar.xz mirror://gentoo/texlive-module-web-2014.tar.xz mirror://gentoo/texlive-module-collection-binextra-2014.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2014.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2014.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2014.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2014.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2014.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2014.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2014.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2014.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2014.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2014.tar.xz mirror://gentoo/texlive-module-ctie.doc-2014.tar.xz mirror://gentoo/texlive-module-cweb.doc-2014.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2014.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2014.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2014.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2014.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2014.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2014.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2014.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2014.tar.xz mirror://gentoo/texlive-module-installfont.doc-2014.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2014.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2014.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2014.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2014.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2014.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2014.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2014.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2014.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2014.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2014.tar.xz mirror://gentoo/texlive-module-patgen.doc-2014.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2014.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2014.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2014.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2014.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2014.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2014.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2014.tar.xz mirror://gentoo/texlive-module-synctex.doc-2014.tar.xz mirror://gentoo/texlive-module-texcount.doc-2014.tar.xz mirror://gentoo/texlive-module-texdef.doc-2014.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2014.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2014.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2014.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2014.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2014.tar.xz mirror://gentoo/texlive-module-texware.doc-2014.tar.xz mirror://gentoo/texlive-module-tie.doc-2014.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2014.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2014.tar.xz mirror://gentoo/texlive-module-web.doc-2014.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2014.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2014.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2014.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2014.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2014.tar.xz mirror://gentoo/texlive-module-texdef.source-2014.tar.xz )
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	texlive-common	8bd0f2143e4bb5fa3bb0bb56aa08006f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=e035ffc506ae3c160bbc30615a4f3f49
diff --git a/metadata/md5-cache/app-text/unrtf-0.21.9 b/metadata/md5-cache/app-text/unrtf-0.21.9
index 5570c167d344..8bafce950943 100644
--- a/metadata/md5-cache/app-text/unrtf-0.21.9
+++ b/metadata/md5-cache/app-text/unrtf-0.21.9
@@ -3,9 +3,9 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys
 DESCRIPTION=Converts RTF files to various formats
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/unrtf/unrtf.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/unrtf/unrtf-0.21.9.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=264f079e43dad8b71f9bb81b03d7e47b
+_md5_=c7befbdfb685f3f856663e942aca6aaf
diff --git a/metadata/md5-cache/app-vim/scala-syntax-1.0 b/metadata/md5-cache/app-vim/scala-syntax-1.0
new file mode 100644
index 000000000000..ec42cedc723b
--- /dev/null
+++ b/metadata/md5-cache/app-vim/scala-syntax-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Scala syntax highlighting, filetype and indent settings
+EAPI=5
+HOMEPAGE=http://www.scala-lang.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~monsieurp/packages/scala-syntax-1.0.tar.gz
+_eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_md5_=5ccc5e10cd696fa1222357942325ad78
diff --git a/metadata/md5-cache/dev-games/cegui-0.8.4 b/metadata/md5-cache/dev-games/cegui-0.8.4
index 2d9210920d8b..ea53e13c3c39 100644
--- a/metadata/md5-cache/dev-games/cegui-0.8.4
+++ b/metadata/md5-cache/dev-games/cegui-0.8.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.4.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d400db0435e0b291a8bfcbc545c25320
+_md5_=32c35f9d686d294072c08fa251401ad3
diff --git a/metadata/md5-cache/dev-lang/inform-6.33.1_p2 b/metadata/md5-cache/dev-lang/inform-6.33.1_p2
index 401646eed0e9..492d1895f62b 100644
--- a/metadata/md5-cache/dev-lang/inform-6.33.1_p2
+++ b/metadata/md5-cache/dev-lang/inform-6.33.1_p2
@@ -3,9 +3,9 @@ DESCRIPTION=design system for interactive fiction
 EAPI=5
 HOMEPAGE=http://www.inform-fiction.org/
 IUSE=emacs
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Artistic-2 Inform
 PDEPEND=emacs? ( app-emacs/inform-mode )
 SLOT=0
 SRC_URI=http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-6.33.1-b2.tar.gz
-_md5_=8052274ea4c7f146b8e5289df91168d8
+_md5_=9669dfde82b1f0cbf32a5c4e216ea929
diff --git a/metadata/md5-cache/dev-lang/pcc-1.1.0 b/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
similarity index 94%
rename from metadata/md5-cache/dev-lang/pcc-1.1.0
rename to metadata/md5-cache/dev-lang/pcc-1.1.0-r1
index 02b06c94bc88..a3b6bd6d3ba0 100644
--- a/metadata/md5-cache/dev-lang/pcc-1.1.0
+++ b/metadata/md5-cache/dev-lang/pcc-1.1.0-r1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/pcc-libs-1.1.0
 SLOT=0
 SRC_URI=ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-1.1.0.tgz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9e95103b7fd8e5886f465a409796a15b
+_md5_=fbca3942be225adae75bf8653e63f444
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.3.2 b/metadata/md5-cache/dev-libs/c-blosc-1.3.2
index 1efb9a4282b1..4af5ea1dc83d 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.3.2
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Blocking, shuffling and lossless compression library
 EAPI=5
 HOMEPAGE=http://www.blosc.org/
 IUSE=hdf5 +lz4 +snappy static-libs test zlib
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=hdf5? ( sci-libs/hdf5 ) lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.3.2.tar.gz -> c-blosc-1.3.2.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b18c9faed3d1c6c9c154707841d6c9f5
+_md5_=789d7cd8a1a5118f88997235a96acca8
diff --git a/metadata/md5-cache/dev-libs/gmp-6.0.0a b/metadata/md5-cache/dev-libs/gmp-6.0.0a
index aeb69247f53c..ced9957b1c8d 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.0.0a
+++ b/metadata/md5-cache/dev-libs/gmp-6.0.0a
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://gmplib.org/
 IUSE=doc cxx pgo static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=LGPL-3
+LICENSE=|| ( LGPL-3+ GPL-2+ )
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-6.0.0a.tar.xz ftp://ftp.gmplib.org/pub/gmp-6.0.0a/gmp-6.0.0a.tar.xz doc? ( http://gmplib.org/gmp-man-6.0.0a.pdf )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=45bf79bbe421faf490656df548832bd3
+_md5_=dc98f1787fe042fd3c7979c094d18dd6
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.3.8 b/metadata/md5-cache/dev-libs/libisoburn-1.3.8
index 1f37fc151955..73fbcd0013e1 100644
--- a/metadata/md5-cache/dev-libs/libisoburn-1.3.8
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.3.8
@@ -4,11 +4,11 @@ DESCRIPTION=Enables creation and expansion of ISO-9660 filesystems on all CD/DVD
 EAPI=5
 HOMEPAGE=http://libburnia-project.org/
 IUSE=acl cdio debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
-KEYWORDS=alpha amd64 arm hppa ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 arm hppa ppc ppc64 x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=>=dev-libs/libburn-1.3.8 >=dev-libs/libisofs-1.3.8 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) cdio? ( >=dev-libs/libcdio-0.83 ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
 REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
 SLOT=0
 SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.3.8.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7fb0e4ac0396b713a94475974340ac7f
+_md5_=fee42b3d7635bfb9499b9058e4cf70de
diff --git a/metadata/md5-cache/dev-libs/quazip-0.7.1 b/metadata/md5-cache/dev-libs/quazip-0.7.1
new file mode 100644
index 000000000000..68b45e359107
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/quazip-0.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=sys-libs/zlib[minizip] qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) test? ( qt4? ( dev-qt/qttest:4 ) qt5? ( dev-qt/qttest:5 ) )
+DESCRIPTION=A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
+EAPI=5
+HOMEPAGE=http://quazip.sourceforge.net/
+IUSE=test qt4 qt5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/zlib[minizip] qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 )
+REQUIRED_USE=^^ ( qt4 qt5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/quazip/quazip-0.7.1.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=62b5a9ebc887eee0cc23124e1851ce3a
diff --git a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.30.0 b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.30.0
index b3fa46c7d09e..6b1fbc5ed3b7 100644
--- a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.30.0
+++ b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.30.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Module-Build dev-lang/perl:=[-build(-)]
+DEPEND=virtual/perl-Module-Build virtual/perl-CPAN-Meta >=virtual/perl-Parse-CPAN-Meta-1.441.400 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Automated accessor generation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Class-ErrorHandler/
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Class-ErrorHandler-0.03.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=c012f3123df9359e086b01b7391b9d82
+_md5_=ea0bb49fba8bced6e91dd7c7cc562fe9
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.31.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.31.0
new file mode 100644
index 000000000000..9f8803915785
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.31.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/DBI dev-perl/Test-Deep virtual/mysql[embedded?] dev-lang/perl:=[-build(-)]
+DESCRIPTION=The Perl DBD:mysql Module
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/DBD-mysql/
+IUSE=embedded test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/DBI dev-perl/Test-Deep virtual/mysql[embedded?] dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.031.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=fe7b9cac20e0f39cfd80357e299e05d4
diff --git a/metadata/md5-cache/dev-perl/Filter-1.490.0 b/metadata/md5-cache/dev-perl/Filter-1.490.0
index c8fcbb2dad78..32a77a995404 100644
--- a/metadata/md5-cache/dev-perl/Filter-1.490.0
+++ b/metadata/md5-cache/dev-perl/Filter-1.490.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Interface for creation of Perl Filters
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Filter/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.49.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=40a7073d6f0868c745f3dee9fa8d015d
+_md5_=ad14847231b47256437fd684a6ee6df5
diff --git a/metadata/md5-cache/dev-perl/Sub-Identify-0.40.0-r1 b/metadata/md5-cache/dev-perl/Sub-Identify-0.40.0-r1
index 18af5a1f04db..4898380f5f3b 100644
--- a/metadata/md5-cache/dev-perl/Sub-Identify-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Sub-Identify-0.40.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Retrieve names of code references
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Sub-Identify/
 IUSE=test
-KEYWORDS=amd64 ppc x86 ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ppc x86 ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.04.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=5f84729db846f85622e28c644eb1b607
+_md5_=199e83eac8a7c76bb55b5f1c6c260f6f
diff --git a/metadata/md5-cache/dev-perl/Test-Base-0.880.0 b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
index 13051db73d8e..f55e7298a47e 100644
--- a/metadata/md5-cache/dev-perl/Test-Base-0.880.0
+++ b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Data Driven Testing Framework
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-Base/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Filter >=dev-perl/Spiffy-0.400.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.88.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=55dd631472a4a094dfbebb047b8369d8
+_md5_=023992fb4ab369fba77b510e8af0b10a
diff --git a/metadata/md5-cache/dev-perl/Text-Diff-1.410.0-r1 b/metadata/md5-cache/dev-perl/Text-Diff-1.410.0-r1
index 3639fa8fab85..d1740e8e3eb4 100644
--- a/metadata/md5-cache/dev-perl/Text-Diff-1.410.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Diff-1.410.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Algorithm-Diff dev-lang/perl:=[-build(-)]
 DESCRIPTION=Easily create test classes in an xUnit style
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Text-Diff/
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Algorithm-Diff dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Text-Diff-1.41.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=0b0914bf1a48afd4fb106937f57914c3
+_md5_=cd17988fb78f393894745df525eaf3ab
diff --git a/metadata/md5-cache/dev-perl/namespace-autoclean-0.240.0 b/metadata/md5-cache/dev-perl/namespace-autoclean-0.240.0
index 45c90897c2e3..4125d9c7252a 100644
--- a/metadata/md5-cache/dev-perl/namespace-autoclean-0.240.0
+++ b/metadata/md5-cache/dev-perl/namespace-autoclean-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=Keep imports out of your namespace
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/namespace-autoclean/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify >=dev-perl/namespace-clean-0.200.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.24.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=faf33e1c2cfeef52891e88ac66b3e699
+_md5_=0b88195fa605c16d88bbb7298616ed3d
diff --git a/metadata/md5-cache/dev-python/3to2-1.0 b/metadata/md5-cache/dev-python/3to2-1.0
index eb6e9244b3fe..e76149a1f7ee 100644
--- a/metadata/md5-cache/dev-python/3to2-1.0
+++ b/metadata/md5-cache/dev-python/3to2-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical c
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/3to2
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-1.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/3/3to2/3to2-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=175956473d754b4b61de88249b443977
+_md5_=bdac19bc8a93c044100c32f0efb6858e
diff --git a/metadata/md5-cache/dev-python/BitVector-3.3.2 b/metadata/md5-cache/dev-python/BitVector-3.3.2
index cce229ec6d7f..ad0cce19ed6c 100644
--- a/metadata/md5-cache/dev-python/BitVector-3.3.2
+++ b/metadata/md5-cache/dev-python/BitVector-3.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A pure-Python memory-efficient packed representation for bit arrays
 EAPI=5
 HOMEPAGE=http://cobweb.ecn.purdue.edu/~kak/dist/ http://pypi.python.org/pypi/BitVector
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PSF-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 ) >=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=http://cobweb.ecn.purdue.edu/~kak/dist/BitVector-3.3.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fa89c8b6bdee16beafaa9496836ab449
+_md5_=6f4c83ed6c6bd6b146b659ab5d378880
diff --git a/metadata/md5-cache/dev-python/Coffin-0.3.8 b/metadata/md5-cache/dev-python/Coffin-0.3.8
index 0637b9591bf0..fa972ef6f5e7 100644
--- a/metadata/md5-cache/dev-python/Coffin-0.3.8
+++ b/metadata/md5-cache/dev-python/Coffin-0.3.8
@@ -4,11 +4,11 @@ DESCRIPTION=Jinja2 adapter for Django
 EAPI=5
 HOMEPAGE=http://github.com/coffin/coffin
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/C/Coffin/Coffin-0.3.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ec6ac3f83c0ab606ad7c07f0fdebc62c
+_md5_=ebaec74bf39c9111943d350195e9aa94
diff --git a/metadata/md5-cache/dev-python/PyFoam-0.5.4-r2 b/metadata/md5-cache/dev-python/PyFoam-0.5.4-r2
index b3cd028c7277..3e0531fe739b 100644
--- a/metadata/md5-cache/dev-python/PyFoam-0.5.4-r2
+++ b/metadata/md5-cache/dev-python/PyFoam-0.5.4-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to analyze and plot the residual files of OpenFOAM computations
 EAPI=5
 HOMEPAGE=http://openfoamwiki.net/index.php/Contrib_PyFoam
 IUSE=extras python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sci-visualization/gnuplot || ( sci-libs/openfoam sci-libs/openfoam-bin ) extras? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/vtk[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=http://openfoamwiki.net/images/a/ae/PyFoam-0.5.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1d4e413806092dbd256bd15ea59d3730
+_md5_=5687ef5479dd9ae1a74cc9fef385add0
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.25.2 b/metadata/md5-cache/dev-python/PyGithub-1.25.2
index 585d3863c456..a41499723247 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.25.2
+++ b/metadata/md5-cache/dev-python/PyGithub-1.25.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python library to access the Github API v3
 EAPI=5
 HOMEPAGE=https://github.com/jacquev6/PyGithub/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jacquev6/PyGithub/archive/v1.25.2.tar.gz -> PyGithub-1.25.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=24bd52ab02ef71a198e9b866efc73b4c
+_md5_=c23265b99254fcdd2f187ba230d70408
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.24 b/metadata/md5-cache/dev-python/PyPDF2-1.24
index 9b7f231d04d9..6c35b70ca3c2 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-1.24
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.24
@@ -4,11 +4,11 @@ DESCRIPTION=Python library to work with pdf files
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/PyPDF2/ http://mstamy2.github.com/PyPDF2
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-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 ) >=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/PyPDF2/PyPDF2-1.24.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c5539e1ca3065ca37858fe1fbea27672
+_md5_=d0286da360a14d11fa890d7f37ee4b6f
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2014.8.5 b/metadata/md5-cache/dev-python/SaltTesting-2014.8.5
index 6bba5c0a0771..eead14eb7844 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2014.8.5
+++ b/metadata/md5-cache/dev-python/SaltTesting-2014.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=Required testing tools needed in the several Salt Stack projects
 EAPI=5
 HOMEPAGE=http://saltstack.org/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SaltTesting/SaltTesting-2014.8.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ca93e2fb0152777328aebf72c58b61af
+_md5_=62d06d5d1123b21b5da1bbfc234c46cf
diff --git a/metadata/md5-cache/dev-python/addons-0.7 b/metadata/md5-cache/dev-python/addons-0.7
index 9c55b5d1dd45..c29c8ba96a03 100644
--- a/metadata/md5-cache/dev-python/addons-0.7
+++ b/metadata/md5-cache/dev-python/addons-0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Dynamically extend other objects (formerly ObjectRoles)
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/AddOns/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZPL
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/A/AddOns/AddOns-0.7.zip -> addons-0.7.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8b9c145f5498cd287f61a23c35b9b15e
+_md5_=99d374c876b3672a41e60c844ca69361
diff --git a/metadata/md5-cache/dev-python/adns-python-1.2.1-r1 b/metadata/md5-cache/dev-python/adns-python-1.2.1-r1
index 129f5fe8d4fe..9a39f37b5ced 100644
--- a/metadata/md5-cache/dev-python/adns-python-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/adns-python-1.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for ADNS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/adns-python/ http://pypi.python.org/pypi/adns-python
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/adns-1.3 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=http://adns-python.googlecode.com/files/adns-python-1.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=52895b8dd9288225be82a322d0504223
+_md5_=459d50ba0aa41405c9df18905ce65c62
diff --git a/metadata/md5-cache/dev-python/adodb-py-2.20-r1 b/metadata/md5-cache/dev-python/adodb-py-2.20-r1
index 82e38795e0b7..d5b7b2587f44 100644
--- a/metadata/md5-cache/dev-python/adodb-py-2.20-r1
+++ b/metadata/md5-cache/dev-python/adodb-py-2.20-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Active Data Objects Data Base library for Python
 EAPI=5
 HOMEPAGE=http://adodb.sourceforge.net/
 IUSE=mysql postgres sqlite python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=postgres? ( dev-python/psycopg:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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/adodb/adodb-220.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=de3228d7520accd1c1cd9d63275e32cf
+_md5_=b5658394a6dcf06f6e2ba13bf55608de
diff --git a/metadata/md5-cache/dev-python/alembic-0.7.4 b/metadata/md5-cache/dev-python/alembic-0.7.4
index 7e6edab5599e..305b9b7e1c18 100644
--- a/metadata/md5-cache/dev-python/alembic-0.7.4
+++ b/metadata/md5-cache/dev-python/alembic-0.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
 EAPI=5
 HOMEPAGE=https://bitbucket.org/zzzeek/alembic
 IUSE=test doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-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/mako[python_targets_python2_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/a/alembic/alembic-0.7.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5a50e02be04858b8e89886f114e3c308
+_md5_=c8dbd1c9b5b64594eb451aa882955e18
diff --git a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1 b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
index fffb2dd432e4..c501c44c1738 100644
--- a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python client for the Advanced Message Queuing Procotol (AMQP)
 EAPI=5
 HOMEPAGE=http://code.google.com/p/py-amqplib/
 IUSE=examples extras test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://py-amqplib.googlecode.com/files/amqplib-1.0.2.tgz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b893891ea2be65eb40799af6f7eb9f94
+_md5_=4fec8a0034a16edeec455d0d164a91ee
diff --git a/metadata/md5-cache/dev-python/aniso8601-0.83 b/metadata/md5-cache/dev-python/aniso8601-0.83
index 0717ffce655c..7496eff92c8b 100644
--- a/metadata/md5-cache/dev-python/aniso8601-0.83
+++ b/metadata/md5-cache/dev-python/aniso8601-0.83
@@ -4,11 +4,11 @@ DESCRIPTION=A library for parsing ISO 8601 strings
 EAPI=5
 HOMEPAGE=https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/aniso8601/aniso8601-0.83.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4edb844552c1a3e58a961152b1d354ca
+_md5_=ba6eb15d3f16811de17690477714b980
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.0.7 b/metadata/md5-cache/dev-python/ansi2html-1.0.7
index aa256b41c229..739ca5005c95 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.0.7
+++ b/metadata/md5-cache/dev-python/ansi2html-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Convert text with ANSI color codes to HTML
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.0.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=07bd5552248ca060faccb61ee0ce7088
+_md5_=5068751026532d771c6bf32c20193142
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.2.4 b/metadata/md5-cache/dev-python/ansicolor-0.2.4
index 22e4974bd5ac..221e5a83c515 100644
--- a/metadata/md5-cache/dev-python/ansicolor-0.2.4
+++ b/metadata/md5-cache/dev-python/ansicolor-0.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Produce ansi color output and colored highlighting and diffing
 EAPI=5
 HOMEPAGE=https://github.com/numerodix/ansicolor
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansicolor/ansicolor-0.2.4.tar.gz https://github.com/numerodix/ansicolor/archive/0.2.4.tar.gz -> ansicolor-0.2.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9e1f8de05e6ab0be4cdb2ad066a0457c
+_md5_=c73078b294649f1b4d4e85798f79df69
diff --git a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1 b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
index e5eccb499677..1018ebaed1d6 100644
--- a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
+++ b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Wraps the best available JSON implementation available in a common i
 EAPI=5
 HOMEPAGE=http://bitbucket.org/runeh/anyjson
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyjson/anyjson-0.3.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bc4f8b94d303824febe3ff1c0565ed27
+_md5_=5181a935fb484dd5a7a6b7cdd8ddcf3c
diff --git a/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1 b/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1
index 0431e0298c1d..53f918536b6d 100644
--- a/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1
+++ b/metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library to access any version control system
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/anyvc
 IUSE=bazaar doc git mercurial subversion python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/apipkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/execnet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bazaar? ( dev-vcs/bzr ) git? ( dev-python/dulwich[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-python/subvertpy ) 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/a/anyvc/anyvc-0.3.7.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=39239c95f9280152d27bfff3daa60221
+_md5_=8121e38d2860156c80759c1e9d50d98e
diff --git a/metadata/md5-cache/dev-python/apipkg-1.2-r1 b/metadata/md5-cache/dev-python/apipkg-1.2-r1
index 1935fb7d8608..59d2416e6d4e 100644
--- a/metadata/md5-cache/dev-python/apipkg-1.2-r1
+++ b/metadata/md5-cache/dev-python/apipkg-1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=namespace control and lazy-import mechanism
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/apipkg
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/a/apipkg/apipkg-1.2.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e32bc3a3c1ac29ac19fd4b29ef4b9205
+_md5_=8ee1e15fbc2dc523f4143678a5faf5af
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.0 b/metadata/md5-cache/dev-python/appdirs-1.4.0
index a4cd992bbbbd..7e5243ade42a 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.0
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Module for determining appropriate platform-specific dirs
 EAPI=5
 HOMEPAGE=http://github.com/ActiveState/appdirs
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/appdirs/appdirs-1.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a3745ec06eae93a831db0f13a6c46047
+_md5_=8cdf22e3cfa00da573438ba924145d9b
diff --git a/metadata/md5-cache/dev-python/apptools-4.2.1 b/metadata/md5-cache/dev-python/apptools-4.2.1
index 3bbeff74166f..a080d13a6c57 100644
--- a/metadata/md5-cache/dev-python/apptools-4.2.1
+++ b/metadata/md5-cache/dev-python/apptools-4.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Application tools
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/app_tools/ http://pypi.python.org/pypi/apptools
 IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-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=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/apptools-4.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=de513e3328a825623231e2d826ff5f33
+_md5_=b8d247e0331c4b2dafac0a05d0046e9c
diff --git a/metadata/md5-cache/dev-python/apse-0.2-r3 b/metadata/md5-cache/dev-python/apse-0.2-r3
index bb94aa72a85d..7256295d1f2d 100644
--- a/metadata/md5-cache/dev-python/apse-0.2-r3
+++ b/metadata/md5-cache/dev-python/apse-0.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Approximate String Matching in Python
 EAPI=5
 HOMEPAGE=http://www.personal.psu.edu/staff/i/u/iua1/python/apse/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~ia64 ppc ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://www.personal.psu.edu/staff/i/u/iua1/python/apse/dist/Apse-0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c46ea3a74c0eb8614e25296d13c29a97
+_md5_=0c432331b5cb16db1c19cef5b458ab61
diff --git a/metadata/md5-cache/dev-python/aquarium-2.3-r1 b/metadata/md5-cache/dev-python/aquarium-2.3-r1
index e4566bb9245a..5a379da73280 100644
--- a/metadata/md5-cache/dev-python/aquarium-2.3-r1
+++ b/metadata/md5-cache/dev-python/aquarium-2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Aquarium web application framework
 EAPI=5
 HOMEPAGE=http://aquarium.sourceforge.net/ http://pypi.python.org/pypi/aquarium
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cheetah[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://sourceforge/aquarium/aquarium-2.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1ded4c4db3ca8543f8dc0294c6e158b9
+_md5_=966ac1eb6ce54a646e362018b8982fb2
diff --git a/metadata/md5-cache/dev-python/argcomplete-0.8.1 b/metadata/md5-cache/dev-python/argcomplete-0.8.1
index 6eef56c58871..6dcc59cb2863 100644
--- a/metadata/md5-cache/dev-python/argcomplete-0.8.1
+++ b/metadata/md5-cache/dev-python/argcomplete-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Bash tab completion for argparse
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/argcomplete
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
 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/a/argcomplete/argcomplete-0.8.1.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2b7fc23fc5feb88a85b61f10de68dcb2
+_md5_=0c0d7c434ea0d06c03190c85d511a8ab
diff --git a/metadata/md5-cache/dev-python/assets-0.1.1-r1 b/metadata/md5-cache/dev-python/assets-0.1.1-r1
index 0908e3f85249..4fde89d4a372 100644
--- a/metadata/md5-cache/dev-python/assets-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/assets-0.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cache-friendly asset management via content-hash-naming
 EAPI=5
 HOMEPAGE=https://launchpad.net/web-assets
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 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=https://launchpad.net/web-assets/trunk/0.1.1/+download/assets-0.1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ae55506a3636aa187691215c56848e6a
+_md5_=770c4b93e65d1f1f4d7591432660515c
diff --git a/metadata/md5-cache/dev-python/astor-0.4 b/metadata/md5-cache/dev-python/astor-0.4
index fe6963b04cbc..ffe2f693397c 100644
--- a/metadata/md5-cache/dev-python/astor-0.4
+++ b/metadata/md5-cache/dev-python/astor-0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Read/rewrite/write Python ASTs
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/astor
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=46ab0577a076323e449f05d0a5d822e3
+_md5_=3570644c1f10dfdf38a4bfb612492ccf
diff --git a/metadata/md5-cache/dev-python/astroid-1.3.4 b/metadata/md5-cache/dev-python/astroid-1.3.4
index aabc3a9a4b74..e424b2236ffa 100644
--- a/metadata/md5-cache/dev-python/astroid-1.3.4
+++ b/metadata/md5-cache/dev-python/astroid-1.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Abstract Syntax Tree for logilab packages
 EAPI=5
 HOMEPAGE=http://bitbucket.org/logilab/astroid http://pypi.python.org/pypi/astroid
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/logilab-common-0.60.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.3.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=55a6afe6e9708fa415011bcc14f4f515
+_md5_=e47dd089767309a1d992a0e02714ff35
diff --git a/metadata/md5-cache/dev-python/async-0.6.2 b/metadata/md5-cache/dev-python/async-0.6.2
index af8f32f0c4c4..c7afea421870 100644
--- a/metadata/md5-cache/dev-python/async-0.6.2
+++ b/metadata/md5-cache/dev-python/async-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Async Framework
 EAPI=5
 HOMEPAGE=http://gitorious.org/git-python/async http://pypi.python.org/pypi/async
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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 ) >=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/a/async/async-0.6.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1ea6aeface1b4f3e35d0cbee196a684c
+_md5_=1a0b74e3807b4f13695a0b93dacc11ad
diff --git a/metadata/md5-cache/dev-python/atom-0.3.10 b/metadata/md5-cache/dev-python/atom-0.3.10
index 7848aa81f025..77f3bf2ea5a0 100644
--- a/metadata/md5-cache/dev-python/atom-0.3.10
+++ b/metadata/md5-cache/dev-python/atom-0.3.10
@@ -4,11 +4,11 @@ DESCRIPTION=Memory efficient Python objects
 EAPI=5
 HOMEPAGE=https://github.com/nucleic/atom
 IUSE=examples test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Clear-BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/atom/atom-0.3.10.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ca245a74dfc9f66a20f81ef6f25c5716
+_md5_=0fb4b759f527447bb8c61fa9f4f6c988
diff --git a/metadata/md5-cache/dev-python/autobahn-0.9.4.2 b/metadata/md5-cache/dev-python/autobahn-0.9.4.2
index f7aacee4904c..68433eb631ab 100644
--- a/metadata/md5-cache/dev-python/autobahn-0.9.4.2
+++ b/metadata/md5-cache/dev-python/autobahn-0.9.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/snappy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lz4[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/wsaccel[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/zope-interface[python_targets_python2_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/a/autobahn/autobahn-0.9.4-2.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3402f3a9dc27f5dc9866e8b0ea789988
+_md5_=19be0ecbcc125461cbcd604e64c4b433
diff --git a/metadata/md5-cache/dev-python/autopep8-1.0.4 b/metadata/md5-cache/dev-python/autopep8-1.0.4
index 6d1df84b63cc..8a4700d613f3 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.0.4
+++ b/metadata/md5-cache/dev-python/autopep8-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guid
 EAPI=5
 HOMEPAGE=https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/hhatto/autopep8/tarball/ver1.0.4 -> autopep8-1.0.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=82aa4f98f77b99865951e8e25658d3ce
+_md5_=5d894f7b31f26ca434be187341cead7d
diff --git a/metadata/md5-cache/dev-python/axiom-0.7.2 b/metadata/md5-cache/dev-python/axiom-0.7.2
index a6cdbe3130bc..20e29f7821e9 100644
--- a/metadata/md5-cache/dev-python/axiom-0.7.2
+++ b/metadata/md5-cache/dev-python/axiom-0.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Object database implemented on top of SQLite
 EAPI=5
 HOMEPAGE=http://divmod.org/trac/wiki/DivmodAxiom http://pypi.python.org/pypi/Axiom
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/epsilon-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-13.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/A/Axiom/Axiom-0.7.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2b413bd95c0d888ffeb1533a30a59746
+_md5_=9afa6a9acf3bf28bf11e229285755e55
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.3 b/metadata/md5-cache/dev-python/backports-lzma-0.0.3
index 7fc3c3f73568..0258a89509f9 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.3
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python 3.3's lzma module for XZ/LZMA compressed files
 EAPI=5
 HOMEPAGE=https://github.com/peterjc/backports.lzma/ http://pypi.python.org/pypi/backports.lzma/
 IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils dev-python/backports[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/b/backports.lzma/backports.lzma-0.0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0a95b7f727cdc8d4502d84a76edb2a01
+_md5_=c047acf1c411f41d2b751b5432793859
diff --git a/metadata/md5-cache/dev-python/basemap-1.0.7-r1 b/metadata/md5-cache/dev-python/basemap-1.0.7-r1
index b6bb36762201..f0a5ab378c27 100644
--- a/metadata/md5-cache/dev-python/basemap-1.0.7-r1
+++ b/metadata/md5-cache/dev-python/basemap-1.0.7-r1
@@ -4,7 +4,7 @@ DESCRIPTION=matplotlib toolkit to plot map projections
 EAPI=5
 HOMEPAGE=http://matplotlib.sourceforge.net/basemap/doc/html/ http://pypi.python.org/pypi/basemap
 IUSE=examples test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT GPL-2
 RDEPEND=sci-libs/shapelib >=dev-python/matplotlib-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/geos-3.3.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pupynere-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dap[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/basemap-1.0.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=263d4092bdc1d4663d4f09ad034c0c5c
+_md5_=dd6fe26414549259a2386ed14c020fbd
diff --git a/metadata/md5-cache/dev-python/billiard-3.3.0.19 b/metadata/md5-cache/dev-python/billiard-3.3.0.19
index 67db65d8415a..f414701ddde3 100644
--- a/metadata/md5-cache/dev-python/billiard-3.3.0.19
+++ b/metadata/md5-cache/dev-python/billiard-3.3.0.19
@@ -4,11 +4,11 @@ DESCRIPTION=Python multiprocessing fork
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/billiard https://github.com/celery/billiard
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.3.0.19.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=04999d20c07cbbe2210eecb7c59b4e25
+_md5_=93e50bd6fc47af64e4a609f2b97b57b1
diff --git a/metadata/md5-cache/dev-python/biplist-0.8 b/metadata/md5-cache/dev-python/biplist-0.8
index f99754c71b11..004a54ad7eba 100644
--- a/metadata/md5-cache/dev-python/biplist-0.8
+++ b/metadata/md5-cache/dev-python/biplist-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=A binary plist parser/generator for Python
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/biplist/ https://github.com/wooster/biplist
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/b/biplist/biplist-0.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e9d9ba744adb728f0141306723b70077
+_md5_=06891150b099e3e720d35aad1e3908a3
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.1 b/metadata/md5-cache/dev-python/bitarray-0.8.1
index 20ce6716992e..08d1da276c00 100644
--- a/metadata/md5-cache/dev-python/bitarray-0.8.1
+++ b/metadata/md5-cache/dev-python/bitarray-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=efficient arrays of booleans -- C extension
 EAPI=5
 HOMEPAGE=https://github.com/ilanschnell/bitarray http://pypi.python.org/pypi/bitarray
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-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 ) >=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/b/bitarray/bitarray-0.8.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e5d1ab1c2d3adda4d0b6709ba7c255fd
+_md5_=ffbee7a6099279a0889392145ab93c30
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.1 b/metadata/md5-cache/dev-python/bitstring-3.1.1
index 342061ee83d0..4d811f776459 100644
--- a/metadata/md5-cache/dev-python/bitstring-3.1.1
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Python module for creation and analysis of binary data
 EAPI=5
 HOMEPAGE=http://python-bitstring.googlecode.com/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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=http://python-bitstring.googlecode.com/files/bitstring-3.1.1.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=75025859f32b96e638215067b119538e
+_md5_=846506b4b3049d64bc1279a1d2e50825
diff --git a/metadata/md5-cache/dev-python/bjoern-1.3.2 b/metadata/md5-cache/dev-python/bjoern-1.3.2
index 041ed7096386..8bdb187b29db 100644
--- a/metadata/md5-cache/dev-python/bjoern-1.3.2
+++ b/metadata/md5-cache/dev-python/bjoern-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A screamingly fast Python WSGI server written in C
 EAPI=5
 HOMEPAGE=https://github.com/jonashaag/bjoern https://pypi.python.org/pypi/bjoern/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libev net-libs/http-parser python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bjoern/bjoern-1.3.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6848232d3e81e72a283e7dba5888f423
+_md5_=4829d5cb8dc4baaa74ccf87e9e8c192e
diff --git a/metadata/md5-cache/dev-python/blaze-0.7.1 b/metadata/md5-cache/dev-python/blaze-0.7.1
index b31f5235ce4f..ec90a31e047a 100644
--- a/metadata/md5-cache/dev-python/blaze-0.7.1
+++ b/metadata/md5-cache/dev-python/blaze-0.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Next generation Python numpy
 EAPI=5
 HOMEPAGE=http://blaze.pydata.org/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/blz-0.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/datashape-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/dynd-python-0.6.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/numpy-1.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/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/cytoolz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/unicodecsv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/multipledispatch-0.4.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/requests[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/into[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/networkx[python_targets_python2_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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ContinuumIO/blaze/archive/0.7.1.tar.gz -> blaze-0.7.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ba24c22a769810adecb7ec4977a01610
+_md5_=cfeff1a3ae2b47d66710c3f8e6a7ba5c
diff --git a/metadata/md5-cache/dev-python/bleach-1.4.1 b/metadata/md5-cache/dev-python/bleach-1.4.1
index 0cc8b5fc5a91..5ce3cc613fac 100644
--- a/metadata/md5-cache/dev-python/bleach-1.4.1
+++ b/metadata/md5-cache/dev-python/bleach-1.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
 EAPI=5
 HOMEPAGE=https://github.com/jsocol/bleach https://pypi.python.org/pypi/bleach
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/html5lib-0.999[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-1.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f895b75d069c3e3f054769de617b3086
+_md5_=dc04ffa9f38f1447bc6075e2308b3b85
diff --git a/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1 b/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
index 6e2f77979463..5e62227a12b9 100644
--- a/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
+++ b/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Enthought Tool Suite: Numerical modeling
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/block_canvas/ http://pypi.python.org/pypi/blockcanvas
 IUSE=doc test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/chaco-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/codetools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/etsdevtools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyface-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/blockcanvas-4.0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c884e82fec2224acd29b24561c2ce7b2
+_md5_=1a01c606ad3a5287d386b2fef32416a7
diff --git a/metadata/md5-cache/dev-python/blz-0.6.2 b/metadata/md5-cache/dev-python/blz-0.6.2
index 40839356924e..364a38c6c6eb 100644
--- a/metadata/md5-cache/dev-python/blz-0.6.2
+++ b/metadata/md5-cache/dev-python/blz-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Chunked, compressed, Python data container for memory and disk
 EAPI=5
 HOMEPAGE=http://blz.pydata.org/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=~dev-libs/c-blosc-1.3.2 >=dev-python/numexpr-2.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/numpy-1.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/ContinuumIO/blz/archive/0.6.2.tar.gz -> blz-0.6.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=05dad9603d4c322c4d2c2abae9203013
+_md5_=8f85e57ed7a167ccc2ce762dd849b7fa
diff --git a/metadata/md5-cache/dev-python/bokeh-0.7.1 b/metadata/md5-cache/dev-python/bokeh-0.7.1
index 0ccf88194452..bbf72aa7c251 100644
--- a/metadata/md5-cache/dev-python/bokeh-0.7.1
+++ b/metadata/md5-cache/dev-python/bokeh-0.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Statistical and interactive HTML plots for Python
 EAPI=5
 HOMEPAGE=http://bokeh.pydata.org/
 IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/colorama-0.2.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/click-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/flask-0.10.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/greenlet-0.4.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/itsdangerous-0.21[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.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/markdown-2.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/markupsafe-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/numpy-1.7.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/pandas-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/pygments-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/python-dateutil-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/pystache-0.5.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/pytz-2013b[python_targets_python2_7(-)?,python_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.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/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/redis-py-2.7.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-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/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(-)] >=dev-python/werkzeug-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(-)] >=net-libs/nodejs-0.8.28[npm] >=www-client/phantomjs-1.9.8 >=www-servers/tornado-4.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(-)] python_targets_python2_7? ( >=dev-python/gevent-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/gevent-websocket-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/ContinuumIO/bokeh/archive/0.7.1.tar.gz -> bokeh-0.7.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5edd3a5918b7de07fa6e46865b4ccefc
+_md5_=511ed4cd69025e70d444a3dacaf779a8
diff --git a/metadata/md5-cache/dev-python/bpython-0.13.2 b/metadata/md5-cache/dev-python/bpython-0.13.2
index 9a2c96de137b..0cc140f551f2 100644
--- a/metadata/md5-cache/dev-python/bpython-0.13.2
+++ b/metadata/md5-cache/dev-python/bpython-0.13.2
@@ -4,11 +4,11 @@ DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
 EAPI=5
 HOMEPAGE=http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython
 IUSE=doc gtk test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/urwid[python_targets_python2_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[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=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=http://www.bpython-interpreter.org/releases/bpython-0.13.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d9ae76365f1f73bb1c78b59bdd970cf7
+_md5_=63ad8d35a7f4b301cea35cd840b26b49
diff --git a/metadata/md5-cache/dev-python/buildutils-0.3-r1 b/metadata/md5-cache/dev-python/buildutils-0.3-r1
index 379e2f496836..55c946255006 100644
--- a/metadata/md5-cache/dev-python/buildutils-0.3-r1
+++ b/metadata/md5-cache/dev-python/buildutils-0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Extensions for developing Python libraries and applications
 EAPI=5
 HOMEPAGE=http://buildutils.lesscode.org http://pypi.python.org/pypi/buildutils
 IUSE=doc test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildutils/buildutils-0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9485934c6424cbf3ca3fff2da9259698
+_md5_=825f6a2e47e015c2a8a33c8f43402f30
diff --git a/metadata/md5-cache/dev-python/buzhug-1.8-r1 b/metadata/md5-cache/dev-python/buzhug-1.8-r1
index 158e9960eb5f..8f7a70327a7a 100644
--- a/metadata/md5-cache/dev-python/buzhug-1.8-r1
+++ b/metadata/md5-cache/dev-python/buzhug-1.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Fast, pure-Python database engine, using a syntax that Python progra
 EAPI=5
 HOMEPAGE=http://buzhug.sourceforge.net/ http://pypi.python.org/pypi/buzhug
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/buzhug/buzhug-1.8.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=89a8a36a96f5365801080889f6c80b68
+_md5_=00b49effadc9c1754dfc7b5ea7a3ce5e
diff --git a/metadata/md5-cache/dev-python/bytecodeassembler-0.6 b/metadata/md5-cache/dev-python/bytecodeassembler-0.6
index 481c89c72175..f61d9dfac113 100644
--- a/metadata/md5-cache/dev-python/bytecodeassembler-0.6
+++ b/metadata/md5-cache/dev-python/bytecodeassembler-0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Generate Python code objects by assembling bytecode
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi//BytecodeAssembler
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/B/BytecodeAssembler/BytecodeAssembler-0.6.zip -> bytecodeassembler-0.6.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ea22718a73477c541e5d327fb8041884
+_md5_=2852bff05851144d5d6be2ede52ca614
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.6 b/metadata/md5-cache/dev-python/cairocffi-0.6
index 92d767f376f7..5ccf7ff6de61 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.6
+++ b/metadata/md5-cache/dev-python/cairocffi-0.6
@@ -4,11 +4,11 @@ DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=5
 HOMEPAGE=https://github.com/SimonSapin/cairocffi
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] x11-libs/cairo:0= dev-python/xcffib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c71eb25907e39fd3001be9ef97bfd451
+_md5_=9fcfb7ae5d57f87d90c8413280fec476
diff --git a/metadata/md5-cache/dev-python/carbon-0.9.13 b/metadata/md5-cache/dev-python/carbon-0.9.13
index d6a791dcf276..c7e24b911562 100644
--- a/metadata/md5-cache/dev-python/carbon-0.9.13
+++ b/metadata/md5-cache/dev-python/carbon-0.9.13
@@ -4,11 +4,11 @@ DESCRIPTION=Backend data caching and persistence daemon for Graphite
 EAPI=5
 HOMEPAGE=http://graphite.wikidot.com/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/whisper[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/txAMQP[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/c/carbon/carbon-0.9.13.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=609431c03a4afa0a2dc99ea80c14f6eb
+_md5_=e170e2fe9bc1404679a9400468a088df
diff --git a/metadata/md5-cache/dev-python/carrot-0.10.7-r1 b/metadata/md5-cache/dev-python/carrot-0.10.7-r1
index 3774d1f83b1a..af9d270cf860 100644
--- a/metadata/md5-cache/dev-python/carrot-0.10.7-r1
+++ b/metadata/md5-cache/dev-python/carrot-0.10.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=AMQP Messaging Framework for Python
 EAPI=5
 HOMEPAGE=http://github.com/ask/carrot/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/anyjson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/amqplib-0.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/c/carrot/carrot-0.10.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c8467dd54cc2b9835ad96a9c59aa0ca5
+_md5_=b024949b6206b969aae58708d8a14796
diff --git a/metadata/md5-cache/dev-python/casuarius-1.1 b/metadata/md5-cache/dev-python/casuarius-1.1
index 41b1a5b7784a..c8b35d523391 100644
--- a/metadata/md5-cache/dev-python/casuarius-1.1
+++ b/metadata/md5-cache/dev-python/casuarius-1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cython wrapper for the Cassowary incremental constraint solver
 EAPI=5
 HOMEPAGE=https://github.com/enthought/casuarius
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/casuarius/casuarius-1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=25aeff246ade7940709f2bb5a71e3f17
+_md5_=89ea8d3a75d9408f4672c106f94e1ea5
diff --git a/metadata/md5-cache/dev-python/celery-3.1.17 b/metadata/md5-cache/dev-python/celery-3.1.17
index f2a2d766de8b..137dc84dfdd8 100644
--- a/metadata/md5-cache/dev-python/celery-3.1.17
+++ b/metadata/md5-cache/dev-python/celery-3.1.17
@@ -4,11 +4,11 @@ DESCRIPTION=Open source asynchronous task queue/job queue based on distributed m
 EAPI=5
 HOMEPAGE=http://celeryproject.org/ http://pypi.python.org/pypi/celery
 IUSE=doc examples redis sqs test yaml zeromq python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=<dev-python/kombu-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/kombu-3.0.24[python_targets_python2_7(-)?,python_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/billiard-3.3.0.19[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/billiard-3.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/pytz[python_targets_python2_7(-)?,python_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[python_targets_python2_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/c/celery/celery-3.1.17.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=938fe765a6fecf589d3a625073c7f0e6
+_md5_=47ca91613d47bf821df8d68731212b48
diff --git a/metadata/md5-cache/dev-python/cfgparse-1.3-r1 b/metadata/md5-cache/dev-python/cfgparse-1.3-r1
index b8a8b2575450..148cc1b7b48c 100644
--- a/metadata/md5-cache/dev-python/cfgparse-1.3-r1
+++ b/metadata/md5-cache/dev-python/cfgparse-1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Config File parser for Python
 EAPI=5
 HOMEPAGE=http://cfgparse.sourceforge.net http://pypi.python.org/pypi/cfgparse
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=PSF-2.3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cfgparse/cfgparse-1.3.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4bb03d7fbb3aca371c12710b39f398a2
+_md5_=357293297c1bc8fda853c3209d901dc0
diff --git a/metadata/md5-cache/dev-python/cgkit-2.0.0 b/metadata/md5-cache/dev-python/cgkit-2.0.0
index 68d537798715..6167b6991d4b 100644
--- a/metadata/md5-cache/dev-python/cgkit-2.0.0
+++ b/metadata/md5-cache/dev-python/cgkit-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for creating 3D images
 EAPI=5
 HOMEPAGE=http://cgkit.sourceforge.net
 IUSE=3ds python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2.1 MPL-1.1 GPL-2
 RDEPEND=>=dev-libs/boost-1.48[python,python_targets_python2_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-python/pyprotocols[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygame[python_targets_python2_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-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] 3ds? ( media-libs/lib3ds ) 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=python_targets_python2_7? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py2k.tar.gz ) python_targets_python3_3? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz ) python_targets_python3_4? ( mirror://sourceforge/cgkit/cgkit/cgkit-2.0.0/cgkit-2.0.0-py3k.tar.gz )
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b329c7d034cdca79fa36e9519d2e06e1
+_md5_=65837e3009a6127a13cd3e2f6284c22b
diff --git a/metadata/md5-cache/dev-python/chaco-4.5.0 b/metadata/md5-cache/dev-python/chaco-4.5.0
index f2a70463f384..a8f03322ca2f 100644
--- a/metadata/md5-cache/dev-python/chaco-4.5.0
+++ b/metadata/md5-cache/dev-python/chaco-4.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Interactive plotting toolkit
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/chaco/
 IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/enable-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-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=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chaco/chaco-4.5.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=38f509d7f7b30810ef6fad9ba70651b0
+_md5_=2ad1811dfebf6c6e3293d512634c750b
diff --git a/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-r1 b/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-r1
index 218fcc22b92d..aa1728b9b822 100644
--- a/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/cherrytemplate-1.0.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Easy and powerful templating module for Python
 EAPI=5
 HOMEPAGE=http://cherrytemplate.python-hosting.com/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~x86
+KEYWORDS=amd64 ~ia64 ppc x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cherrypy/CherryTemplate-1.0.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0eb604fe44f0baa1d91d143472afabc0
+_md5_=2fafdad0378659f07d8e8a8daef89375
diff --git a/metadata/md5-cache/dev-python/click-3.3 b/metadata/md5-cache/dev-python/click-3.3
index f69b34ef0ba8..4166fd8d7c1b 100644
--- a/metadata/md5-cache/dev-python/click-3.3
+++ b/metadata/md5-cache/dev-python/click-3.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Python package for creating beautiful command line interfaces
 EAPI=5
 HOMEPAGE=http://click.pocoo.org/ http://pypi.python.org/pypi/click
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-3.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2b1ce15f5ce6eccc49563764ed6b9c23
+_md5_=4933c9c4e1214f7319efd731af384854
diff --git a/metadata/md5-cache/dev-python/clientcookie-1.3.0-r1 b/metadata/md5-cache/dev-python/clientcookie-1.3.0-r1
index f8cacb56e850..a3914448be92 100644
--- a/metadata/md5-cache/dev-python/clientcookie-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/clientcookie-1.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for handling HTTP cookies on the client side
 EAPI=5
 HOMEPAGE=http://wwwsearch.sourceforge.net/ClientCookie/ http://pypi.python.org/pypi/ClientCookie
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://wwwsearch.sourceforge.net/ClientCookie/src/ClientCookie-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9c54a3d990cbdd59155173ae3ecab043
+_md5_=24b21851193c7b216a8b4610b2b48917
diff --git a/metadata/md5-cache/dev-python/cliff-1.8.0 b/metadata/md5-cache/dev-python/cliff-1.8.0
index 0461a0fcb368..cf585a344a1f 100644
--- a/metadata/md5-cache/dev-python/cliff-1.8.0
+++ b/metadata/md5-cache/dev-python/cliff-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=5
 HOMEPAGE=https://github.com/dreamhost/cliff
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cmd2-0.6.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.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/pyparsing-2.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/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/stevedore-0.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(-)] 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/c/cliff/cliff-1.8.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a0e864b6a8d9a38ce3146aab705fb037
+_md5_=7cbd043fc1a388c9b27d53731d46bc1c
diff --git a/metadata/md5-cache/dev-python/codetools-4.2.0 b/metadata/md5-cache/dev-python/codetools-4.2.0
index c5e69700aaa0..f7fb1e49fbbd 100644
--- a/metadata/md5-cache/dev-python/codetools-4.2.0
+++ b/metadata/md5-cache/dev-python/codetools-4.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Code analysis and execution tools
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/code_tools/
 IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-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=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/codetools/codetools-4.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6ed224f36aa7e2aa39acf959fe21b108
+_md5_=3885acd0e110438eb1a079ee9705538b
diff --git a/metadata/md5-cache/dev-python/colander-1.0 b/metadata/md5-cache/dev-python/colander-1.0
index 98f4eaa70369..8e26a0c47fb6 100644
--- a/metadata/md5-cache/dev-python/colander-1.0
+++ b/metadata/md5-cache/dev-python/colander-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A simple schema-based serialization and deserialization library
 EAPI=5
 HOMEPAGE=http://docs.pylonsproject.org/projects/colander/en/latest/ http://pypi.python.org/pypi/colander
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze MIT
 RDEPEND=>=dev-python/translationstring-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] 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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colander/colander-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6748752885aff4bbda9509c6fae11585
+_md5_=7dc15e364e8a4dcaa9e756b7bb199f96
diff --git a/metadata/md5-cache/dev-python/colout-0.1 b/metadata/md5-cache/dev-python/colout-0.1
index 6500bd039911..0ca6104921e6 100644
--- a/metadata/md5-cache/dev-python/colout-0.1
+++ b/metadata/md5-cache/dev-python/colout-0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Adds color to arbitrary command output
 EAPI=5
 HOMEPAGE=http://nojhan.github.com/colout/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_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[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 ) >=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 ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colout/colout-0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=201c3ce932b0ea5a2d5b97dcc09e5a62
+_md5_=4e6c8f1edcd17d35ca62596c0ef38b55
diff --git a/metadata/md5-cache/dev-python/columnize-0.3.5-r1 b/metadata/md5-cache/dev-python/columnize-0.3.5-r1
index d317423ef8e5..4d93771373b0 100644
--- a/metadata/md5-cache/dev-python/columnize-0.3.5-r1
+++ b/metadata/md5-cache/dev-python/columnize-0.3.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Format a simple (i.e. not nested) list into aligned columns
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pycolumnize/ http://pypi.python.org/pypi/columnize
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PSF-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=http://pycolumnize.googlecode.com/files/columnize-0.3.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c4f7093db182be3ac8fa580fcf1ea0fa
+_md5_=14a8eb40be1041ae695f4e17c6b13204
diff --git a/metadata/md5-cache/dev-python/common-0.1.1 b/metadata/md5-cache/dev-python/common-0.1.1
index 51ca3218b0cf..1dec3ae409c6 100644
--- a/metadata/md5-cache/dev-python/common-0.1.1
+++ b/metadata/md5-cache/dev-python/common-0.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Common tools and data structures implemented in pure python
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/common
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
 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 )
@@ -12,4 +12,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=mirror://pypi/c/common/common-0.1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8ee22ad2a0c8d9af2e952813da64ac32
+_md5_=74d9deba063204eb800cf6a122bafe50
diff --git a/metadata/md5-cache/dev-python/configargparse-0.9.3 b/metadata/md5-cache/dev-python/configargparse-0.9.3
index 2efd2ebc145f..8c613d7925be 100644
--- a/metadata/md5-cache/dev-python/configargparse-0.9.3
+++ b/metadata/md5-cache/dev-python/configargparse-0.9.3
@@ -4,11 +4,11 @@ DESCRIPTION=A drop-in replacement for argparse that adds support for config file
 EAPI=5
 HOMEPAGE=https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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/C/ConfigArgParse/ConfigArgParse-0.9.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=704f79b7ab245c4c150e5a836ddd26e4
+_md5_=564a04825095e65b2810745872c6b995
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.5 b/metadata/md5-cache/dev-python/configobj-5.0.5
index 611a33fbcf51..97993309029b 100644
--- a/metadata/md5-cache/dev-python/configobj-5.0.5
+++ b/metadata/md5-cache/dev-python/configobj-5.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Simple config file reader and writer
 EAPI=5
 HOMEPAGE=http://www.voidspace.org.uk/python/configobj.html http://code.google.com/p/configobj/ http://pypi.python.org/pypi/configobj
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/configobj/configobj-5.0.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4532ed0ff169371c74e4931eaac96d8d
+_md5_=ca99f28efdeeba7a536725120a0442c9
diff --git a/metadata/md5-cache/dev-python/configparser-3.3.0.2 b/metadata/md5-cache/dev-python/configparser-3.3.0.2
index 0430b6ab0721..36560e7b5f3e 100644
--- a/metadata/md5-cache/dev-python/configparser-3.3.0.2
+++ b/metadata/md5-cache/dev-python/configparser-3.3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python-3 built-in configparser
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/configparser/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configparser/configparser-3.3.0r2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4a78cccc87ac7fc0213c76814a73bd29
+_md5_=a418bf0921ae6d813d842a531668cdfb
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.4.0 b/metadata/md5-cache/dev-python/contextlib2-0.4.0
index 09acb7ae9bb0..6746f3e8d770 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.4.0
+++ b/metadata/md5-cache/dev-python/contextlib2-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Backports and enhancements for the contextlib module
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/contextlib2
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PSF-2.4
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b3f5b5cc5eb878723004284eaa7e4dd3
+_md5_=80238cdd44d764b4f22abaa50e8c54a1
diff --git a/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1 b/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1
index f28f2b1ef715..50899a33d8dc 100644
--- a/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1
+++ b/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cosmology routines built on NumPy/SciPy
 EAPI=5
 HOMEPAGE=http://roban.github.com/CosmoloPy/ http://pypi.python.org/pypi/CosmoloPy
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=sci-libs/scipy[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/C/CosmoloPy/CosmoloPy-0.1.104.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c7716f29a6037ee145e580d494ad12b0
+_md5_=8f68d330a1cefefab7bb987a4ecd35c8
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r2 b/metadata/md5-cache/dev-python/crcmod-1.7-r2
index 50851c8846c1..cd45bbe20d73 100644
--- a/metadata/md5-cache/dev-python/crcmod-1.7-r2
+++ b/metadata/md5-cache/dev-python/crcmod-1.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python CRC Generator module
 EAPI=5
 HOMEPAGE=http://crcmod.sourceforge.net/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://sourceforge/crcmod/crcmod-1.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9fc47a80965d2543b0738dee25f03af5
+_md5_=c9c3789f01699691b5b50c92fa1c8049
diff --git a/metadata/md5-cache/dev-python/cssutils-0.9.10-r1 b/metadata/md5-cache/dev-python/cssutils-0.9.10-r1
index 3e34c73336cb..bda0a8f15e63 100644
--- a/metadata/md5-cache/dev-python/cssutils-0.9.10-r1
+++ b/metadata/md5-cache/dev-python/cssutils-0.9.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A CSS Cascading Style Sheets library
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils
 IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ppc ~x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://bitbucket.org/cthedot/cssutils/get/6fbc1877f6089610b733a92d21c2bbf25dc1ca28.tar.gz -> cssutils-0.9.10.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=7feb1157c1f9718151a14dc502c76144
+_md5_=daf0a4f0c92e0122b7cb6c4e97e8586d
diff --git a/metadata/md5-cache/dev-python/cython-0.22 b/metadata/md5-cache/dev-python/cython-0.22
index 99f9ef4cc0e9..1bc0b95826a0 100644
--- a/metadata/md5-cache/dev-python/cython-0.22
+++ b/metadata/md5-cache/dev-python/cython-0.22
@@ -4,11 +4,11 @@ DESCRIPTION=A Python to C compiler
 EAPI=5
 HOMEPAGE=http://www.cython.org/ http://pypi.python.org/pypi/Cython
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 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=http://www.cython.org/release/Cython-0.22.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=75b944a87561ffed26847a78f3596f75
+_md5_=cbc29ccbfec8de13899298f2829d12e0
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.7.1 b/metadata/md5-cache/dev-python/cytoolz-0.7.1
index 6cf8b3c28c2d..57afa8e3df4f 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.7.1
+++ b/metadata/md5-cache/dev-python/cytoolz-0.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cython implementation of Toolz: High performance functional utilitie
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cytoolz
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cython[python_targets_python2_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/c/cytoolz/cytoolz-0.7.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b52937eab1cf5295f8da20a13b5d2989
+_md5_=739490970cdd23a029decd2f2924a2df
diff --git a/metadata/md5-cache/dev-python/d2to1-0.2.11 b/metadata/md5-cache/dev-python/d2to1-0.2.11
index f5dbda3216ad..2f137464a69a 100644
--- a/metadata/md5-cache/dev-python/d2to1-0.2.11
+++ b/metadata/md5-cache/dev-python/d2to1-0.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=Allows using distutils2-like setup.cfg files for a package metadata
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/d2to1
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/d2to1/d2to1-0.2.11.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5fa956fcb4c2ed55d72b07a023f14951
+_md5_=d3ef1b045f8009a0246570c61edf48f1
diff --git a/metadata/md5-cache/dev-python/dap-2.2.6.7-r1 b/metadata/md5-cache/dev-python/dap-2.2.6.7-r1
index 029aeba6b313..1b96c72e9040 100644
--- a/metadata/md5-cache/dev-python/dap-2.2.6.7-r1
+++ b/metadata/md5-cache/dev-python/dap-2.2.6.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Data Access Protocol client and server
 EAPI=5
 HOMEPAGE=http://pydap.org http://pypi.python.org/pypi/dap http://pypi.python.org/pypi/Pydap
 IUSE=server python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] server? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastescript[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dap/dap-2.2.6.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d99d7f8dc514dc18a196dea6b683836d
+_md5_=738557eed72c848b8b3f814ba81372e7
diff --git a/metadata/md5-cache/dev-python/datashape-0.4.2 b/metadata/md5-cache/dev-python/datashape-0.4.2
index 92f3d3b0c78e..f0520e5e7981 100644
--- a/metadata/md5-cache/dev-python/datashape-0.4.2
+++ b/metadata/md5-cache/dev-python/datashape-0.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Language defining a data description protocol
 EAPI=5
 HOMEPAGE=https://github.com/ContinuumIO/datashape
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/multipledispatch[python_targets_python2_7(-)?,python_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-dateutil[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/ContinuumIO/datashape/archive/0.4.2.tar.gz -> datashape-0.4.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=981da605e42c1ff05786a09fb605d4c6
+_md5_=262252abe0f8226b3747f4a11c7d5c3c
diff --git a/metadata/md5-cache/dev-python/dbutils-1.1-r1 b/metadata/md5-cache/dev-python/dbutils-1.1-r1
index 5878284114ea..434e502210e2 100644
--- a/metadata/md5-cache/dev-python/dbutils-1.1-r1
+++ b/metadata/md5-cache/dev-python/dbutils-1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Database connections for multi-threaded environments
 EAPI=5
 HOMEPAGE=http://www.webwareforpython.org/DBUtils http://pypi.python.org/pypi/DBUtils
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=OSL-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.webwareforpython.org/downloads/DBUtils/DBUtils-1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f3658db76c93ec20ab49d5b16b43ce61
+_md5_=19a455ea32dc0c7ceb80df394415f8dd
diff --git a/metadata/md5-cache/dev-python/decoratortools-1.8-r1 b/metadata/md5-cache/dev-python/decoratortools-1.8-r1
index df5b19c15f21..d0baaf1362e7 100644
--- a/metadata/md5-cache/dev-python/decoratortools-1.8-r1
+++ b/metadata/md5-cache/dev-python/decoratortools-1.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Class, function, and metaclass decorators
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/DecoratorTools
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=|| ( PSF-2 ZPL )
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/D/DecoratorTools/DecoratorTools-1.8.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c2c64b7322f545d89a1df8671fcbf673
+_md5_=9871c2385c7755daf3e8ed2132e0a84a
diff --git a/metadata/md5-cache/dev-python/deform-0.9.9 b/metadata/md5-cache/dev-python/deform-0.9.9
index 7a5afe941ea0..8e7d537ce3ec 100644
--- a/metadata/md5-cache/dev-python/deform-0.9.9
+++ b/metadata/md5-cache/dev-python/deform-0.9.9
@@ -4,7 +4,7 @@ DESCRIPTION=Another form generation library
 EAPI=5
 HOMEPAGE=http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze
 RDEPEND=>=dev-python/translationstring-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/colander-1.0_alpha1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/peppercorn-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/chameleon-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/deform/deform-0.9.9.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5682df964fb5d5fc5080d91f6c1bd6c4
+_md5_=be86f8f6279a38a8548baaea4238ccdc
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.4.1-r1 b/metadata/md5-cache/dev-python/defusedxml-0.4.1-r1
index 6ced75aedeff..2738a3122b1e 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/defusedxml-0.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=XML bomb protection for Python stdlib modules, an xml serialiser
 EAPI=5
 HOMEPAGE=https://bitbucket.org/tiran/defusedxml
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~hppa ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa x86
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_pypy? ( virtual/pypy:0=[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/defusedxml/defusedxml-0.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7abd7941ad9dbfe7f9a7f17561d14650
+_md5_=7343fe01e42f6696cf5f7cf06ea0759d
diff --git a/metadata/md5-cache/dev-python/dicttoxml-1.5.6 b/metadata/md5-cache/dev-python/dicttoxml-1.5.6
index 5ead2753834d..666a85b95100 100644
--- a/metadata/md5-cache/dev-python/dicttoxml-1.5.6
+++ b/metadata/md5-cache/dev-python/dicttoxml-1.5.6
@@ -4,11 +4,11 @@ DESCRIPTION=Converts a Python dictionary or other native data type into a valid
 EAPI=5
 HOMEPAGE=https://github.com/quandyfactory/dicttoxml
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 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 ) >=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/d/dicttoxml/dicttoxml-1.5.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8afff7d36d17ad6488fbab616bdba317
+_md5_=4da76ffef8a0fdeb4ed2eb99ce49e97c
diff --git a/metadata/md5-cache/dev-python/dingus-0.3.4-r1 b/metadata/md5-cache/dev-python/dingus-0.3.4-r1
index 68d7166e217f..42b93cf43655 100644
--- a/metadata/md5-cache/dev-python/dingus-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/dingus-0.3.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A record-then-assert mocking library
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/dingus/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/dingus/dingus-0.3.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8b06ef4d30559334fba0ecfa0a8cf6eb
+_md5_=55b49fc6107619c2278aad134a8f7a0b
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.0.2 b/metadata/md5-cache/dev-python/discogs-client-2.0.2
index c83ecac627c2..366bf0b765c5 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.0.2
+++ b/metadata/md5-cache/dev-python/discogs-client-2.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Official Python API client for Discogs
 EAPI=5
 HOMEPAGE=http://github.com/discogs/discogs_client http://pypi.python.org/pypi/discogs-client
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/oauth2[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/discogs/discogs_client/archive/v2.0.2.tar.gz -> discogs-client-2.0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3420d4070d77feab34979a7d86c889a0
+_md5_=8f2ccd81302f27015ca6c1647c1638e9
diff --git a/metadata/md5-cache/dev-python/disqus-python-0.4.2 b/metadata/md5-cache/dev-python/disqus-python-0.4.2
index d8feb1145723..2c54a9d71529 100644
--- a/metadata/md5-cache/dev-python/disqus-python-0.4.2
+++ b/metadata/md5-cache/dev-python/disqus-python-0.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python client library for accessing the disqus.com API
 EAPI=5
 HOMEPAGE=https://github.com/disqus/disqus-python
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/disqus-python/disqus-python-0.4.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=9a950f3ab4376287118177868e01ebd8
+_md5_=875a25956e61b8a35434f66ce6589cd8
diff --git a/metadata/md5-cache/dev-python/django-1.7.5 b/metadata/md5-cache/dev-python/django-1.7.6
similarity index 98%
rename from metadata/md5-cache/dev-python/django-1.7.5
rename to metadata/md5-cache/dev-python/django-1.7.6
index c9b6d5fd457a..e4af72963d39 100644
--- a/metadata/md5-cache/dev-python/django-1.7.5
+++ b/metadata/md5-cache/dev-python/django-1.7.6
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_pypy? ( virtual/pypy:0=[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
-SRC_URI=https://www.djangoproject.com/m/releases/1.7/Django-1.7.5.tar.gz
+SRC_URI=https://www.djangoproject.com/m/releases/1.7/Django-1.7.6.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=013f418ed71b970e4165f9130a8097d9
+_md5_=05b2d3da47cda7f53815a4f91bdffe7a
diff --git a/metadata/md5-cache/dev-python/django-annoying-0.7.7 b/metadata/md5-cache/dev-python/django-annoying-0.7.7
index 10b10bf067dc..b99688ecc300 100644
--- a/metadata/md5-cache/dev-python/django-annoying-0.7.7
+++ b/metadata/md5-cache/dev-python/django-annoying-0.7.7
@@ -4,11 +4,11 @@ DESCRIPTION=This is django application that try to eliminate annoying things in
 EAPI=5
 HOMEPAGE=http://bitbucket.org/offline/django-annoying/wiki/Home
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-annoying/django-annoying-0.7.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ae3447a9eb99992114a226e4d70be1ed
+_md5_=ab3d69d805ab1a89437d886515857f9b
diff --git a/metadata/md5-cache/dev-python/django-appconf-0.6 b/metadata/md5-cache/dev-python/django-appconf-0.6
index 8932194fd1e7..a0cd5aa5e707 100644
--- a/metadata/md5-cache/dev-python/django-appconf-0.6
+++ b/metadata/md5-cache/dev-python/django-appconf-0.6
@@ -4,11 +4,11 @@ DESCRIPTION=A helper class for handling configuration defaults of packaged apps
 EAPI=5
 HOMEPAGE=https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/django-1.4.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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jezdez/django-appconf/archive/v0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bdc60ca306c299fe5d7388d10e78149a
+_md5_=98d85e31d78a78c74d53eedd5cfe5c26
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2 b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
index b2f86bfe2480..1d91fdaa8664 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-1.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Django LDAP authentication backend
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-auth-ldap http://bitbucket.org/psagers/django-auth-ldap/
 IUSE=doc test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] >=dev-python/python-ldap-2.0[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b57da5d61fdf236917486df5ab8ddd17
+_md5_=2e918416a39ed88f44552fc21e5b8d81
diff --git a/metadata/md5-cache/dev-python/django-celery-3.1.16 b/metadata/md5-cache/dev-python/django-celery-3.1.16
index bdf968c06fa8..49bf04966f73 100644
--- a/metadata/md5-cache/dev-python/django-celery-3.1.16
+++ b/metadata/md5-cache/dev-python/django-celery-3.1.16
@@ -4,11 +4,11 @@ DESCRIPTION=Celery Integration for Django
 EAPI=5
 HOMEPAGE=http://celeryproject.org/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/celery-3.1.15[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/django[python_targets_python2_7(-)?,python_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[python_targets_python2_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=doc? ( ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-celery/django-celery-3.1.16.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=516bc470d2460baa3ec0d154dbfc984a
+_md5_=43f6ef5ec50a980e35e47decc221d471
diff --git a/metadata/md5-cache/dev-python/django-compressor-1.4 b/metadata/md5-cache/dev-python/django-compressor-1.4
index 7cfaeeddacc4..814853fa7de8 100644
--- a/metadata/md5-cache/dev-python/django-compressor-1.4
+++ b/metadata/md5-cache/dev-python/django-compressor-1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Compresses linked and inline javascript or CSS into a single cached
 EAPI=5
 HOMEPAGE=https://github.com/django-compressor/django-compressor
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/django-appconf-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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/jezdez/django_compressor/archive/1.4.tar.gz -> django-compressor-1.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8659f6d5b01db340f00a3fcedb15915d
+_md5_=6747f4171f3f92e3edf9f2e62c219bcd
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-1.2.2 b/metadata/md5-cache/dev-python/django-debug-toolbar-1.2.2
index 4e7b7235f4f6..b27125c878ec 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-1.2.2
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-1.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A configurable set of panels that display debug information
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-debug-toolbar/ https://github.com/django-debug-toolbar/django-debug-toolbar/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/django-1.4.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-sqlparse-0.1.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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/django-debug-toolbar/django-debug-toolbar/archive/1.2.2.tar.gz -> django-debug-toolbar-1.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ad2e838c232871ae67496374e5db2cad
+_md5_=e88566828411d92a9a8335121ca72bcc
diff --git a/metadata/md5-cache/dev-python/django-discover-runner-1.0 b/metadata/md5-cache/dev-python/django-discover-runner-1.0
index 2f21eb1810e1..fc75ed69dec3 100644
--- a/metadata/md5-cache/dev-python/django-discover-runner-1.0
+++ b/metadata/md5-cache/dev-python/django-discover-runner-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Django test runner based on unittest2's test discovery
 EAPI=5
 HOMEPAGE=https://github.com/jezdez/django-discover-runner https://pypi.python.org/pypi/django-discover-runner
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/django[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-discover-runner/django-discover-runner-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=83c8bae70335b8fb5a8030fc5c4f63ef
+_md5_=7737b02e9540adccc7badd36b12fbeb3
diff --git a/metadata/md5-cache/dev-python/django-endless-pagination-2.0 b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
index bdf93e6fc523..ca929dda9b90 100644
--- a/metadata/md5-cache/dev-python/django-endless-pagination-2.0
+++ b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Tools supporting ajax, multiple and lazy pagination, Twitter-style a
 EAPI=5
 HOMEPAGE=https://github.com/frankban/django-endless-pagination
 IUSE=doc test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/django-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=https://github.com/frankban/django-endless-pagination/archive/v2.0.tar.gz -> django-endless-pagination-2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c75fd5a67bf2741f3acfdf9dd9a49149
+_md5_=789a3d304e3eb737aa367c3c6218daa7
diff --git a/metadata/md5-cache/dev-python/django-evolution-0.7.4 b/metadata/md5-cache/dev-python/django-evolution-0.7.4
index 1bef4e0d4b53..49e6ef4bd1cd 100644
--- a/metadata/md5-cache/dev-python/django-evolution-0.7.4
+++ b/metadata/md5-cache/dev-python/django-evolution-0.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Django application that will run cron jobs for other django apps
 EAPI=5
 HOMEPAGE=http://code.google.com/p/django-evolution/ http://pypi.python.org/pypi/django_evolution/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[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=http://downloads.reviewboard.org/releases/django-evolution/0.7/django_evolution-0.7.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=db4c0ea51a2b5ff8a4e5e43651ce5429
+_md5_=c76cc36d2d253e56c5449d6da50f7dbf
diff --git a/metadata/md5-cache/dev-python/django-haystack-2.2.0 b/metadata/md5-cache/dev-python/django-haystack-2.2.0
index f345dc7ecb92..03d65d657357 100644
--- a/metadata/md5-cache/dev-python/django-haystack-2.2.0
+++ b/metadata/md5-cache/dev-python/django-haystack-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Pluggable search for Django
 EAPI=5
 HOMEPAGE=http://haystacksearch.org/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/django-1.5.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-haystack/django-haystack-2.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a0243a8fd768443d59744665a2f0bf0c
+_md5_=95f07a69f554d2a4b8920b9135dd1933
diff --git a/metadata/md5-cache/dev-python/django-international-0.0.6 b/metadata/md5-cache/dev-python/django-international-0.0.6
index 3f4df9de1cb6..25752cdb378d 100644
--- a/metadata/md5-cache/dev-python/django-international-0.0.6
+++ b/metadata/md5-cache/dev-python/django-international-0.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Country and currency data for Django projects
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-international https://bitbucket.org/monwara/django-international
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-international/django-international-0.0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=563d805bc0b299c3c297a07f2f942ac5
+_md5_=55e66e21b550bd3d5e3d23b350cd2434
diff --git a/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-r1 b/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-r1
index 7433105499f9..fff4c1a192a1 100644
--- a/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/django-ldap-groups-0.1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A reusable application for the Django web framework
 EAPI=5
 HOMEPAGE=http://code.google.com/p/django-ldap-groups
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://django-ldap-groups.googlecode.com/files/django-ldap-groups-0.1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d47b60fa5dc817afc585a4ab0982fe89
+_md5_=4257e57a62d1d72d43cc25c9d517bf74
diff --git a/metadata/md5-cache/dev-python/django-ldapdb-0.3.2 b/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
index f3bba1d13049..5110723a3c67 100644
--- a/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
+++ b/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=An LDAP database backend for Django
 EAPI=5
 HOMEPAGE=https://github.com/jlaine/django-ldapdb
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-ldap-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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-ldapdb/django-ldapdb-0.3.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=65c3b6b90fbcbf7feb7768a05cb4fcd8
+_md5_=b39745bad5eafd0f9265f651a3b2cd47
diff --git a/metadata/md5-cache/dev-python/django-nose-1.3 b/metadata/md5-cache/dev-python/django-nose-1.3
index b2cc511133a2..88b02ac45482 100644
--- a/metadata/md5-cache/dev-python/django-nose-1.3
+++ b/metadata/md5-cache/dev-python/django-nose-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Django test runner that uses nose
 EAPI=5
 HOMEPAGE=https://github.com/jbalogh/django-nose
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/nose-1.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/django[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-nose/django-nose-1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a4e1cac0c6f867ac570d8a8baa22d368
+_md5_=8d1aabe593b6bc460083f5e4b3886078
diff --git a/metadata/md5-cache/dev-python/django-oauth-plus-2.2.5 b/metadata/md5-cache/dev-python/django-oauth-plus-2.2.5
index cac82e7397ee..69ad97193dea 100644
--- a/metadata/md5-cache/dev-python/django-oauth-plus-2.2.5
+++ b/metadata/md5-cache/dev-python/django-oauth-plus-2.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Support of OAuth 1.0a in Django using python-oauth2
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-oauth-plus http://code.welldev.org/django-oauth-plus/
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] >=dev-python/oauth2-1.5.170[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] >=dev-python/south-1.0[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-oauth-plus/django-oauth-plus-2.2.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e61e02cdf75f48221d5c90eb9e06ecc4
+_md5_=c1b91291197c9ec7f931e07095609fd1
diff --git a/metadata/md5-cache/dev-python/django-openid-auth-0.5 b/metadata/md5-cache/dev-python/django-openid-auth-0.5
index 3c8400afe739..215aa7e14f4e 100644
--- a/metadata/md5-cache/dev-python/django-openid-auth-0.5
+++ b/metadata/md5-cache/dev-python/django-openid-auth-0.5
@@ -4,11 +4,11 @@ DESCRIPTION=A library that can be used to add OpenID support to Django applicati
 EAPI=5
 HOMEPAGE=https://launchpad.net/django-openid-auth
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-openid-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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/django-openid-auth/trunk/0.5/+download/django-openid-auth-0.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1fc3c8e6d5bec4417de8bc57be4dd6b8
+_md5_=39e4fbe15c97bd7aa7fa7c23e9722dca
diff --git a/metadata/md5-cache/dev-python/django-openstack-auth-1.1.5 b/metadata/md5-cache/dev-python/django-openstack-auth-1.1.5
index 65a3cf73b1de..44e60cf9f867 100644
--- a/metadata/md5-cache/dev-python/django-openstack-auth-1.1.5
+++ b/metadata/md5-cache/dev-python/django-openstack-auth-1.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=A Django authentication backend for use with the OpenStack Keystone
 EAPI=5
 HOMEPAGE=http://django_openstack_auth.readthedocs.org/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/python-keystoneclient-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/django-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/django-1.7[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/d/django_openstack_auth/django_openstack_auth-1.1.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=91d7dda4b418e03f1f15c6af16e9eb6a
+_md5_=01414ce82332732e72e1fded1db8295b
diff --git a/metadata/md5-cache/dev-python/django-picklefield-0.3.1 b/metadata/md5-cache/dev-python/django-picklefield-0.3.1
index 76108e99e541..800894525007 100644
--- a/metadata/md5-cache/dev-python/django-picklefield-0.3.1
+++ b/metadata/md5-cache/dev-python/django-picklefield-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of a pickled object field for django
 EAPI=5
 HOMEPAGE=http://github.com/shrubberysoft/django-picklefield
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/django-1.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[python_targets_python2_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/d/django-picklefield/django-picklefield-0.3.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=dab3eb8b13e5c608da24320834c2f772
+_md5_=a87340c5ea9f03a46e3386667688d3cd
diff --git a/metadata/md5-cache/dev-python/django-pipeline-1.3.26 b/metadata/md5-cache/dev-python/django-pipeline-1.3.26
index 431ccf93830e..d684db253966 100644
--- a/metadata/md5-cache/dev-python/django-pipeline-1.3.26
+++ b/metadata/md5-cache/dev-python/django-pipeline-1.3.26
@@ -4,11 +4,11 @@ DESCRIPTION=An asset packaging library for Django
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/django-1.5.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/jsmin[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/cyberdelia/django-pipeline/archive/1.3.26.tar.gz -> django-pipeline-1.3.26.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2a5243d424b0a0ab46e89208674c9f09
+_md5_=7631ca3f9871804e8a37f6394814805e
diff --git a/metadata/md5-cache/dev-python/django-piston-0.2.3-r1 b/metadata/md5-cache/dev-python/django-piston-0.2.3-r1
index eeb59e765742..ff488849f299 100644
--- a/metadata/md5-cache/dev-python/django-piston-0.2.3-r1
+++ b/metadata/md5-cache/dev-python/django-piston-0.2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A mini-framework for Django for creating RESTful APIs
 EAPI=5
 HOMEPAGE=http://bitbucket.org/jespern/django-piston/wiki/Home
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-piston/django-piston-0.2.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0bbac7bc468bb80e636839ea345d1cbb
+_md5_=afbff03a663404d7afe09d532a829318
diff --git a/metadata/md5-cache/dev-python/django-recaptcha-1.0.3 b/metadata/md5-cache/dev-python/django-recaptcha-1.0.3
index e24884bbe150..81e85793fba0 100644
--- a/metadata/md5-cache/dev-python/django-recaptcha-1.0.3
+++ b/metadata/md5-cache/dev-python/django-recaptcha-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Django recaptcha form field/widget app
 EAPI=5
 HOMEPAGE=http://github.com/praekelt/django-recaptcha http://pypi.python.org/pypi/django-recaptcha
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/praekelt/django-recaptcha/archive/1.0.3.tar.gz -> django-recaptcha-1.0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=cb01f02df944163c0126eb6ea40fb2c4
+_md5_=d747c15c63b8235f01fd7dc131fa9fb5
diff --git a/metadata/md5-cache/dev-python/django-select2-4.2.2 b/metadata/md5-cache/dev-python/django-select2-4.2.2
index b29025a99660..007541663098 100644
--- a/metadata/md5-cache/dev-python/django-select2-4.2.2
+++ b/metadata/md5-cache/dev-python/django-select2-4.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Django integration of Select2
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/Django-Select2
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/django[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/D/Django-Select2/Django-Select2-4.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2825b45070fc004b9c78410a23c5b22a
+_md5_=1e987eff1c35d5e8efd181e908723871
diff --git a/metadata/md5-cache/dev-python/django-setuptest-0.1.6 b/metadata/md5-cache/dev-python/django-setuptest-0.1.6
index ae97ce9da956..ab738299bacf 100644
--- a/metadata/md5-cache/dev-python/django-setuptest-0.1.6
+++ b/metadata/md5-cache/dev-python/django-setuptest-0.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=Simple test suite enabling Django app testing via setup.py
 EAPI=5
 HOMEPAGE=https://github.com/praekelt/django-setuptest
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/django[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/praekelt/django-setuptest/archive/0.1.6.tar.gz -> django-setuptest-0.1.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1ce5b7417030e86d15ba0fc9da6d7dc6
+_md5_=2f52a255507a20945b3c6387ffce7389
diff --git a/metadata/md5-cache/dev-python/django-social-auth-0.7.28 b/metadata/md5-cache/dev-python/django-social-auth-0.7.28
index 61908e5d4b82..201e4ae0e125 100644
--- a/metadata/md5-cache/dev-python/django-social-auth-0.7.28
+++ b/metadata/md5-cache/dev-python/django-social-auth-0.7.28
@@ -4,7 +4,7 @@ DESCRIPTION=An easy to setup social authentication/authorization mechanism for D
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-social-auth/
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/django-1.2.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2-1.5.167[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-openid-2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/selenium-2.29.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/mock-1.0.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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/omab/django-social-auth/archive/v0.7.28.tar.gz -> django-social-auth-0.7.28.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e0e340711f89e0f7f91ef9422f90bd65
+_md5_=814d52928674c3722dcdfd6cce96a966
diff --git a/metadata/md5-cache/dev-python/django-tastypie-0.9.15 b/metadata/md5-cache/dev-python/django-tastypie-0.9.15
index cc2b1b5a674e..42ab135c018e 100644
--- a/metadata/md5-cache/dev-python/django-tastypie-0.9.15
+++ b/metadata/md5-cache/dev-python/django-tastypie-0.9.15
@@ -4,11 +4,11 @@ DESCRIPTION=A flexible and capable API layer for django utilising serialisers
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie
 IUSE=bip doc digest lxml oauth test yaml python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/mimeparse-0.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/django-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/defusedxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bip? ( dev-python/biplist[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) digest? ( dev-python/python-digest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) oauth? ( dev-python/oauth2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/django-oauth-plus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lxml? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) yaml? ( dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/toastdriven/django-tastypie/archive/v0.9.15.tar.gz -> django-tastypie-0.9.15.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=02cda817c9b316e5b559c00f922d0012
+_md5_=05752d2dfbecff695a07ff247b7ec885
diff --git a/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1 b/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
index b66293b24391..4bba98cbe72e 100644
--- a/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/django-xslt-0.4.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=an XSLT template system for Django
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-xslt/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-xslt/django-xslt-0.4.5.tar.gz test? ( http://dev.gentoo.org/~tampakrap/tarballs/django-xslt-demoapp-0.4.5_p20120427.tar.bz2 )
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e0c6591cd95db396d36f191c7239aba7
+_md5_=81cd3aca3cf3be997319ad38ab1c761c
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2 b/metadata/md5-cache/dev-python/docopt-0.6.2
index 945fd87114be..e3372710c965 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic argument parser, that will make you smile
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/docopt/docopt-0.6.2.tar.gz https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bc07e5096a31ca0f5ad6c30dc5869677
+_md5_=242ca33b2fecaf7ab821feb851c7bbb9
diff --git a/metadata/md5-cache/dev-python/dogpile-core-0.4.1 b/metadata/md5-cache/dev-python/dogpile-core-0.4.1
index babd937213e4..fd9c60597abb 100644
--- a/metadata/md5-cache/dev-python/dogpile-core-0.4.1
+++ b/metadata/md5-cache/dev-python/dogpile-core-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A lock which allows a thread to generate an expensive resource while
 EAPI=5
 HOMEPAGE=https://bitbucket.org/zzzeek/dogpile.core
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=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/d/dogpile.core/dogpile.core-0.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=283e84dca03407d4ef02a754b0e5e731
+_md5_=11e563e47e976939da79a8404fbd0161
diff --git a/metadata/md5-cache/dev-python/doit-0.27.0 b/metadata/md5-cache/dev-python/doit-0.27.0
new file mode 100644
index 000000000000..dd3f5b9f3080
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doit-0.27.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Automation tool
+EAPI=5
+HOMEPAGE=http://python-doit.sourceforge.net/ http://pypi.python.org/pypi/doit
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/d/doit/doit-0.27.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=30271ef54c7ee3d3fb5890ed7d5d964f
diff --git a/metadata/md5-cache/dev-python/dpkt-1.8-r1 b/metadata/md5-cache/dev-python/dpkt-1.8-r1
index d0ec3d899698..1df855422e63 100644
--- a/metadata/md5-cache/dev-python/dpkt-1.8-r1
+++ b/metadata/md5-cache/dev-python/dpkt-1.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Fast, simple packet creation / parsing, with definitions for the bas
 EAPI=5
 HOMEPAGE=http://code.google.com/p/dpkt/
 IUSE=examples python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dpkt.googlecode.com/files/dpkt-1.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=633a5e0ad7b2adeb07b7bc0bb2ccb845
+_md5_=66fbff95669a25bd51d67f0d386741b1
diff --git a/metadata/md5-cache/dev-python/dreampie-1.2.1 b/metadata/md5-cache/dev-python/dreampie-1.2.1
index b0de7d9badde..9b68298e0e53 100644
--- a/metadata/md5-cache/dev-python/dreampie-1.2.1
+++ b/metadata/md5-cache/dev-python/dreampie-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=pygtk-based python shell
 EAPI=5
 HOMEPAGE=http://dreampie.org/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtksourceview[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dreampie/dreampie-1.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8ec7818fca2052c89b42a45ec309d473
+_md5_=0b19698be9587843fa9f46c0216954e2
diff --git a/metadata/md5-cache/dev-python/drpython-3.11.4 b/metadata/md5-cache/dev-python/drpython-3.11.4
index b70aefa2217a..5a5f5933f31b 100644
--- a/metadata/md5-cache/dev-python/drpython-3.11.4
+++ b/metadata/md5-cache/dev-python/drpython-3.11.4
@@ -4,11 +4,11 @@ DESCRIPTION=A powerful cross-platform IDE for Python
 EAPI=5
 HOMEPAGE=http://drpython.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~x86
+KEYWORDS=amd64 ~ia64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/wxpython-2.6 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/drpython/DrPython_3.11.4.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6d4b3054db3df654ed5b6c72b616feeb
+_md5_=aa56d4c9e3c5d2f87d8cdf75c1d71633
diff --git a/metadata/md5-cache/dev-python/dugong-3.4 b/metadata/md5-cache/dev-python/dugong-3.4
index ace0ea82f5af..6e2b6aa18ef4 100644
--- a/metadata/md5-cache/dev-python/dugong-3.4
+++ b/metadata/md5-cache/dev-python/dugong-3.4
@@ -4,11 +4,11 @@ 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
+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	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=287e8e1f17076718b66e7f7333fb3c3a
+_md5_=1e3b390d88762e6a07341f111f019306
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.6.5 b/metadata/md5-cache/dev-python/dynd-python-0.6.5
index 9a62e10b20f5..8c823a3dc217 100644
--- a/metadata/md5-cache/dev-python/dynd-python-0.6.5
+++ b/metadata/md5-cache/dev-python/dynd-python-0.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=Python exposure of multidimensionnal array library libdynd
 EAPI=5
 HOMEPAGE=https://github.com/ContinuumIO/dynd-python
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=~dev-libs/libdynd-0.6.5 >=dev-python/numpy-1.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(-)]
 SLOT=0
 SRC_URI=https://github.com/ContinuumIO/dynd-python/archive/v0.6.5.tar.gz -> dynd-python-0.6.5.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c291a52a1c3e172accb8f9c9139d0972
+_md5_=e3c6dd4d024762ea69a5365fb428e5d4
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-1.4.0 b/metadata/md5-cache/dev-python/elasticsearch-py-1.4.0
index 326e7474463a..bba643ffbdce 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-1.4.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=official Python low-level client for Elasticsearch
 EAPI=5
 HOMEPAGE=http://elasticsearch-py.rtfd.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~mips ~x86
+KEYWORDS=amd64 ~arm ~mips x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/1.4.0.tar.gz -> elasticsearch-py-1.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d53cfafd6bb4f4c386b23429c947dfd4
+_md5_=d082677086e376c44947bde0cb70cab5
diff --git a/metadata/md5-cache/dev-python/embedly-0.4.3-r1 b/metadata/md5-cache/dev-python/embedly-0.4.3-r1
index 052b67727269..c887465571ad 100644
--- a/metadata/md5-cache/dev-python/embedly-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/embedly-0.4.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Library for Embedly
 EAPI=5
 HOMEPAGE=https://github.com/embedly/embedly-python/ http://pypi.python.org/pypi/Embedly
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[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/E/Embedly/Embedly-0.4.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=29c82d38d61f6e1ab2f391e1f7c65120
+_md5_=7b75f62572e2f0b7909e48cadfcdb6b5
diff --git a/metadata/md5-cache/dev-python/enable-4.4.1 b/metadata/md5-cache/dev-python/enable-4.4.1
index fdaaed19eaec..277557c0bd30 100644
--- a/metadata/md5-cache/dev-python/enable-4.4.1
+++ b/metadata/md5-cache/dev-python/enable-4.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Drawing and interaction packages
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable
 IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/freetype-2 virtual/opengl virtual/glu x11-libs/libX11 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/enthought/enable/archive/4.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=72c9e9f4b684e42e52ec4b9466699f63
+_md5_=b615fcff57cc14bf3c94a7fcc6b56138
diff --git a/metadata/md5-cache/dev-python/enaml-0.6.8-r1 b/metadata/md5-cache/dev-python/enaml-0.6.8-r1
index 851a171b45b2..255e5e731975 100644
--- a/metadata/md5-cache/dev-python/enaml-0.6.8-r1
+++ b/metadata/md5-cache/dev-python/enaml-0.6.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: framework for writing declarative interfaces
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/enaml/ http://pypi.python.org/pypi/enaml
 IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/casuarius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyside[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=http://www.enthought.com/repo/ets/enaml-0.6.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ec9ff3c6640ef7153ab60497e4d3b541
+_md5_=6e4bb0b2b345a6c0e698acee42e10fdf
diff --git a/metadata/md5-cache/dev-python/enaml-0.9.8 b/metadata/md5-cache/dev-python/enaml-0.9.8
index 656d655af7ef..ed592a5f9474 100644
--- a/metadata/md5-cache/dev-python/enaml-0.9.8
+++ b/metadata/md5-cache/dev-python/enaml-0.9.8
@@ -4,7 +4,7 @@ DESCRIPTION=Enthought Tool Suite: framework for writing declarative interfaces
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/enaml/ http://pypi.python.org/pypi/enaml
 IUSE=examples test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/atom-0.3.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kiwisolver-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ply-3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyside[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/enaml/enaml-0.9.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5cca2c1be33081b1bfa5e518e22a91f8
+_md5_=4a18291777d63e9b15aec1a6e0b1d516
diff --git a/metadata/md5-cache/dev-python/encore-0.4.0 b/metadata/md5-cache/dev-python/encore-0.4.0
index 663b02581396..fcc7e8ae9c26 100644
--- a/metadata/md5-cache/dev-python/encore-0.4.0
+++ b/metadata/md5-cache/dev-python/encore-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: collection of core-level utility modules
 EAPI=5
 HOMEPAGE=https://github.com/enthought/encore
 IUSE=doc examples test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/encore/encore-0.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=49b3a10f9609bceee8f4d3aec649d5dc
+_md5_=5244d66ddfd7a6347d24c6cd2b568c79
diff --git a/metadata/md5-cache/dev-python/encore-0.5.1 b/metadata/md5-cache/dev-python/encore-0.5.1
index 7b7f5f02b304..4ce02976695d 100644
--- a/metadata/md5-cache/dev-python/encore-0.5.1
+++ b/metadata/md5-cache/dev-python/encore-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: collection of core-level utility modules
 EAPI=5
 HOMEPAGE=https://github.com/enthought/encore
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/e/encore/encore-0.5.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=31dbd5352b1b37094993f56047cd6f57
+_md5_=a9b56ac1a98d985202b71f74135d9806
diff --git a/metadata/md5-cache/dev-python/enum34-1.0 b/metadata/md5-cache/dev-python/enum34-1.0
index 43b2fb3e7820..822d3af26923 100644
--- a/metadata/md5-cache/dev-python/enum34-1.0
+++ b/metadata/md5-cache/dev-python/enum34-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python 3.4 Enum backported
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/enum34
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~mips ~x86
+KEYWORDS=amd64 ~mips 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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/e/enum34/enum34-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c8e84b30cedaab6ee3fa04f5857ec1a1
+_md5_=6323b0e751a08d8c55bdc5c1e33acdd0
diff --git a/metadata/md5-cache/dev-python/envisage-4.4.0 b/metadata/md5-cache/dev-python/envisage-4.4.0
index b090c737eea5..8814c58f809e 100644
--- a/metadata/md5-cache/dev-python/envisage-4.4.0
+++ b/metadata/md5-cache/dev-python/envisage-4.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Enthought Tool Suite: Extensible application framework
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/envisage
 IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/traits-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=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/envisage/envisage-4.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d04e7289b706309c4d1519890f574ac5
+_md5_=a30b2941e9bed481a953bd649e60ac3b
diff --git a/metadata/md5-cache/dev-python/envoy-0.0.3 b/metadata/md5-cache/dev-python/envoy-0.0.3
index 6af834167c7f..9166aa8665fa 100644
--- a/metadata/md5-cache/dev-python/envoy-0.0.3
+++ b/metadata/md5-cache/dev-python/envoy-0.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Simple API for running external processes
 EAPI=5
 HOMEPAGE=https://github.com/kennethreitz/envoy http://pypi.python.org/pypi/envoy
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/e/envoy/envoy-0.0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4d9ed9b7a3cf15ab7d0530a27eac9a4a
+_md5_=593adbe188a446e33cdf88a1c239fac7
diff --git a/metadata/md5-cache/dev-python/epsilon-0.7.0 b/metadata/md5-cache/dev-python/epsilon-0.7.0
index 4bef8876a567..06a46a9abd7e 100644
--- a/metadata/md5-cache/dev-python/epsilon-0.7.0
+++ b/metadata/md5-cache/dev-python/epsilon-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Epsilon is a Python utilities package, most famous for its Time clas
 EAPI=5
 HOMEPAGE=http://divmod.org/trac/wiki/DivmodEpsilon http://pypi.python.org/pypi/Epsilon
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/twisted-core-13.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[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/E/Epsilon/Epsilon-0.7.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=384e4cddebceff16f2f92d9d5f1cf1bc
+_md5_=e47c2a46993d1f2857c450cdf1631026
diff --git a/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2 b/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2
index 96c760c8a721..e7ce2e45eabc 100644
--- a/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2
+++ b/metadata/md5-cache/dev-python/errorhandler-1.1.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A logging framework handler that tracks when messages above a certai
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/errorhandler
 IUSE=doc python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/e/errorhandler/errorhandler-1.1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9ea369723d4fd030abe0393d9db10bc8
+_md5_=523ac40112e80bea82900d953929435f
diff --git a/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1 b/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
index e42f72d45a15..ac160cdbf227 100644
--- a/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
+++ b/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Tools to support Python development
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/dev_tools.php http://pypi.python.org/pypi/etsdevtools
 IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[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=http://www.enthought.com/repo/ets/etsdevtools-4.0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3f4426333a670f66fcda944839d32557
+_md5_=84ff8a7af973e05f8eb1062ec6ac825c
diff --git a/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1 b/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
index f55b00c504f4..ae9a1b640e3d 100644
--- a/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Proxy modules for backwards compatibility
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/etsproxy
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!<dev-python/apptools-4 !<dev-python/blockcanvas-4 !<dev-python/chaco-4 !<dev-python/codetools-4 !<dev-python/enable-4 !<dev-python/enthoughtbase-4 !<dev-python/envisagecore-4 !<dev-python/envisageplugins-4 !<dev-python/etsdevtools-4 !<dev-python/etsprojecttools-4 !<dev-python/graphcanvas-4 !<sci-visualization/mayavi-4 !<dev-python/scimath-4 !<dev-python/traits-4 !<dev-python/traitsbackendwx-4 !<dev-python/traitsbackendqt-4 !<dev-python/traitsgui-4 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=http://www.enthought.com/repo/ets/etsproxy-0.1.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=212d265a01905c94fc987941b4dca062
+_md5_=35ef972a8cfb212b6bef4edb70dc391d
diff --git a/metadata/md5-cache/dev-python/eventlet-0.13.0 b/metadata/md5-cache/dev-python/eventlet-0.13.0
index 3dfbb523016a..a8d72f1465a0 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.13.0
+++ b/metadata/md5-cache/dev-python/eventlet-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=Highly concurrent networking library
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/eventlet
 IUSE=doc examples test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/greenlet-0.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/e/eventlet/eventlet-0.13.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2aa8393312f4e20308ac4e7dd34973ab
+_md5_=9d769790fc3873ad22e01c57433c84c6
diff --git a/metadata/md5-cache/dev-python/execnet-1.2.0-r2 b/metadata/md5-cache/dev-python/execnet-1.2.0-r2
index 3bcef06f2662..425ed9add878 100644
--- a/metadata/md5-cache/dev-python/execnet-1.2.0-r2
+++ b/metadata/md5-cache/dev-python/execnet-1.2.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Rapid multi-Python deployment
 EAPI=5
 HOMEPAGE=http://codespeak.net/execnet/ http://pypi.python.org/pypi/execnet/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7300c2ab3bc536eab21ad3fc2c4c8de9
+_md5_=488f27d0c2fae890bb48a6d2bd0a03a6
diff --git a/metadata/md5-cache/dev-python/extremes-1.1.1 b/metadata/md5-cache/dev-python/extremes-1.1.1
index 4173acfedc1e..df9cf89b8c19 100644
--- a/metadata/md5-cache/dev-python/extremes-1.1.1
+++ b/metadata/md5-cache/dev-python/extremes-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Production-quality 'Min' and 'Max' objects
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/Extremes
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZPL
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/E/Extremes/Extremes-1.1.1.zip -> extremes-1.1.1.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6a1ad274b23dd3fd182ccf1ec7a37475
+_md5_=7d16e1c79f59f5cfe0b0ac53722b1fc0
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.7 b/metadata/md5-cache/dev-python/feedgenerator-1.7
index 204c68435ba5..a11cc6925d23 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.7
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.7
@@ -4,11 +4,11 @@ DESCRIPTION=Standalone version of django.utils.feedgenerator
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/feedgenerator
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6deb024752ddc83a53d0dc22a82c990c
+_md5_=52ac58a7e3bbec550084f14f6ef09fc8
diff --git a/metadata/md5-cache/dev-python/feedparser-5.1.3-r2 b/metadata/md5-cache/dev-python/feedparser-5.1.3-r2
index 3b62b93df6e4..5f1249ca1ecf 100644
--- a/metadata/md5-cache/dev-python/feedparser-5.1.3-r2
+++ b/metadata/md5-cache/dev-python/feedparser-5.1.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Parse RSS and Atom feeds in Python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/feedparser/ http://pypi.python.org/pypi/feedparser
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD-2 PSF-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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://feedparser.googlecode.com/files/feedparser-5.1.3.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0db21692d9d3ad6134dfd7d2353c531e
+_md5_=e1aa4fe2df5c5b5c56200e31d8d9127e
diff --git a/metadata/md5-cache/dev-python/fexpect-0.2 b/metadata/md5-cache/dev-python/fexpect-0.2
index 84d879221bfc..1b99bb42099b 100644
--- a/metadata/md5-cache/dev-python/fexpect-0.2
+++ b/metadata/md5-cache/dev-python/fexpect-0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Extension for fabric to handle prompts through pexpect
 EAPI=5
 HOMEPAGE=https://github.com/ilogue/fexpect
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/fabric[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/shortuuid[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ilogue/fexpect/archive/0.2.tar.gz -> fexpect-0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a0db037e8936dba4ee05bfd648f4f68f
+_md5_=8972446e5652dff7c5c22984ed94b1ab
diff --git a/metadata/md5-cache/dev-python/figleaf-0.6.1-r1 b/metadata/md5-cache/dev-python/figleaf-0.6.1-r1
index 85d159d37c80..195c765168b2 100644
--- a/metadata/md5-cache/dev-python/figleaf-0.6.1-r1
+++ b/metadata/md5-cache/dev-python/figleaf-0.6.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Code coverage tool
 EAPI=5
 HOMEPAGE=http://darcs.idyll.org/~t/projects/figleaf/doc/ http://pypi.python.org/pypi/figleaf
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://darcs.idyll.org/~t/projects/figleaf-0.6.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c07203d93af9f810463c21b396db81c6
+_md5_=6e7e5de1d47137d52f0e6a14df1bbcd4
diff --git a/metadata/md5-cache/dev-python/fixtures-0.3.14-r2 b/metadata/md5-cache/dev-python/fixtures-0.3.14-r2
index 8d70bf562f27..65bd93cd53c6 100644
--- a/metadata/md5-cache/dev-python/fixtures-0.3.14-r2
+++ b/metadata/md5-cache/dev-python/fixtures-0.3.14-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Fixtures, reusable state for writing clean tests and more
 EAPI=5
 HOMEPAGE=https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/testtools-0.9.22 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-0.3.14.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4530b9b1699f54981dfd086a14b0e398
+_md5_=7ae475cc003e228151777707f7212df9
diff --git a/metadata/md5-cache/dev-python/flake8-2.0 b/metadata/md5-cache/dev-python/flake8-2.0
deleted file mode 100644
index 1c1dacdebccc..000000000000
--- a/metadata/md5-cache/dev-python/flake8-2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pep8-1.4.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( dev-python/mccabe[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=A wrapper around PyFlakes, pep8 & mccabe
-EAPI=5
-HOMEPAGE=http://bitbucket.org/tarek/flake8
-IUSE=test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86
-LICENSE=MIT
-PDEPEND=dev-python/mccabe[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-RDEPEND=>=dev-python/pyflakes-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pep8-1.4.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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8/flake8-2.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d2a580991db5d5588f17a55ade3ef2c7
diff --git a/metadata/md5-cache/dev-python/flake8-2.0-r1 b/metadata/md5-cache/dev-python/flake8-2.0-r1
deleted file mode 100644
index a447d0164556..000000000000
--- a/metadata/md5-cache/dev-python/flake8-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(-)] test? ( 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=the modular source code checker: pep8, pyflakes and co
-EAPI=5
-HOMEPAGE=http://bitbucket.org/tarek/flake8
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyflakes-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/pep8-1.4.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/mccabe-0.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8/flake8-2.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=15b8f87e449c1166e513a542ed6387c4
diff --git a/metadata/md5-cache/dev-python/flake8-2.1.0 b/metadata/md5-cache/dev-python/flake8-2.4.0
similarity index 89%
rename from metadata/md5-cache/dev-python/flake8-2.1.0
rename to metadata/md5-cache/dev-python/flake8-2.4.0
index 8b619c60ed88..08b15db747b4 100644
--- a/metadata/md5-cache/dev-python/flake8-2.1.0
+++ b/metadata/md5-cache/dev-python/flake8-2.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyflakes-0.7.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/pep8-1.4.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/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/mccabe-0.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/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(-)] dev-python/mock[python_targets_python2_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/pyflakes-0.7.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/pep8-1.5.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/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/mccabe-0.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/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(-)] dev-python/mock[python_targets_python2_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 wrapper around PyFlakes, pep8 & mccabe
 EAPI=5
-HOMEPAGE=http://bitbucket.org/tarek/flake8
+HOMEPAGE=http://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.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(-)]
-RDEPEND=>=dev-python/pyflakes-0.7.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/pep8-1.4.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(-)]
+RDEPEND=>=dev-python/pyflakes-0.7.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/pep8-1.5.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(-)] 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/f/flake8/flake8-2.1.0.tar.gz
+SRC_URI=mirror://pypi/f/flake8/flake8-2.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=66b691f5d84ef9433a6b702488bfc441
+_md5_=1b85dc9a2d5bf023c270074998337fd1
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.0.6 b/metadata/md5-cache/dev-python/flask-admin-1.0.6
index 1498a2c48e06..e52fbb5cc75d 100644
--- a/metadata/md5-cache/dev-python/flask-admin-1.0.6
+++ b/metadata/md5-cache/dev-python/flask-admin-1.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Simple and extensible admin interface framework for Flask
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[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/F/Flask-Admin/Flask-Admin-1.0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=001ddde0b1733e924a28c6d5c9c90aab
+_md5_=04f557b00a2f6087f85c501f8591f618
diff --git a/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2 b/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2
index 9fd5e889371c..a59e134df68b 100644
--- a/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2
+++ b/metadata/md5-cache/dev-python/flask-dashed-0.1b_p2
@@ -4,11 +4,11 @@ DESCRIPTION=Admin app framework for flask
 EAPI=5
 HOMEPAGE=http://pythonhosted.org/Flask-Dashed/ https://pypi.python.org/pypi/Flask-Dashed
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-wtf[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/F/Flask-Dashed/Flask-Dashed-0.1b2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=da48b501bde87cde81e3658fa5f77ebd
+_md5_=463bb577a5993749c424623808e13fe3
diff --git a/metadata/md5-cache/dev-python/flask-evolution-0.5-r1 b/metadata/md5-cache/dev-python/flask-evolution-0.5-r1
index 3536657ece56..5757f584c6c2 100644
--- a/metadata/md5-cache/dev-python/flask-evolution-0.5-r1
+++ b/metadata/md5-cache/dev-python/flask-evolution-0.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple migrations for Flask/SQLAlchemy projects
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/Flask-Evolution
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-script[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/F/Flask-Evolution/Flask-Evolution-0.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a073f83ffe9c36570bb7fb00cdb9936d
+_md5_=075e3df3690e6d45dd1585051028f9f7
diff --git a/metadata/md5-cache/dev-python/flask-migrate-1.3.0 b/metadata/md5-cache/dev-python/flask-migrate-1.3.0
index cefa8db7d701..06642d987bfd 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-1.3.0
+++ b/metadata/md5-cache/dev-python/flask-migrate-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=SQLAlchemy database migrations for Flask applications using Alembic
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[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/F/Flask-Migrate/Flask-Migrate-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=65c11e1c8a39e1e3a3289ddcaa0c379e
+_md5_=2f059fb06e5c19d390915e695bd0dd3d
diff --git a/metadata/md5-cache/dev-python/flask-openid-1.2.4 b/metadata/md5-cache/dev-python/flask-openid-1.2.4
index 87ad882ab8ad..532d1ea7eede 100644
--- a/metadata/md5-cache/dev-python/flask-openid-1.2.4
+++ b/metadata/md5-cache/dev-python/flask-openid-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=OpenID support for Flask
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/Flask-OpenID
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-openid-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-OpenID/Flask-OpenID-1.2.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1ed4a13f94ed779d39703542d7b66e52
+_md5_=49e2c58ad8160697af40e19cdae803d9
diff --git a/metadata/md5-cache/dev-python/flask-pymongo-0.3.0 b/metadata/md5-cache/dev-python/flask-pymongo-0.3.0
index 893c982232c1..cddb7fd8b41b 100644
--- a/metadata/md5-cache/dev-python/flask-pymongo-0.3.0
+++ b/metadata/md5-cache/dev-python/flask-pymongo-0.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=PyMongo support for Flask
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/Flask-PyMongo
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pymongo-2.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=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dcrosta/flask-pymongo/archive/0.3.0.tar.gz -> flask-pymongo-0.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a7c6b5642ff91a107c097a3d46239eb2
+_md5_=ddf295b3ebb7f3dabe78ffc40f9acb24
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.2.12 b/metadata/md5-cache/dev-python/flask-restful-0.2.12
index 05cc3aa6d55a..4ee622b59621 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.2.12
+++ b/metadata/md5-cache/dev-python/flask-restful-0.2.12
@@ -4,11 +4,11 @@ DESCRIPTION=Simple framework for creating REST APIs
 EAPI=5
 HOMEPAGE=http://flask-restful.readthedocs.org/ https://github.com/twilio/flask-restful/
 IUSE=doc examples paging test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/aniso8601-0.82[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/flask-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/six-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/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] paging? ( >=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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.2.12.tar.gz -> flask-restful-0.2.12.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8eb0f3ed9298a57cc3e7c35bedb0cb64
+_md5_=276211f15e104a7ee96f6404f3ca323f
diff --git a/metadata/md5-cache/dev-python/flask-restless-0.15.0 b/metadata/md5-cache/dev-python/flask-restless-0.15.0
index cfc36ca34c92..2fbceb50f10a 100644
--- a/metadata/md5-cache/dev-python/flask-restless-0.15.0
+++ b/metadata/md5-cache/dev-python/flask-restless-0.15.0
@@ -4,11 +4,11 @@ DESCRIPTION=Flask extension for easy ReSTful API generation
 EAPI=5
 HOMEPAGE=http://packages.python.org/Flask-Restless/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( AGPL-3 BSD )
 RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/mimerender[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_pypy? ( virtual/pypy:0=[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/jfinkels/flask-restless/archive/0.15.0.tar.gz -> flask-restless-0.15.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3ae42529658a7f1204424b487e79ff8e
+_md5_=b8e1d80782e73a9614e675b2c90499a4
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.5 b/metadata/md5-cache/dev-python/flask-script-2.0.5
index 8f3a71754c60..c58acebe3ca0 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.5
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Flask support for writing external scripts
 EAPI=5
 HOMEPAGE=http://packages.python.org/Flask-Script/ http://pypi.python.org/pypi/Flask-Script
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Script/Flask-Script-2.0.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=70854d13646279abdf36319161917007
+_md5_=84b2b64a2c50414328f264b68976750d
diff --git a/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1 b/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1
index f8db7e011e3d..3c9e7d6c103a 100644
--- a/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/flask-themes-0.1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Infrastructure for theming support in Flask applications
 EAPI=5
 HOMEPAGE=http://packages.python.org/Flask-Themes/ http://pypi.python.org/pypi/Flask-Themes
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/flask-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Themes/Flask-Themes-0.1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a593285392f705b276095501c8849ab2
+_md5_=2fd857166330b15c80834d66012d0e4e
diff --git a/metadata/md5-cache/dev-python/flask-whooshalchemy-0.56 b/metadata/md5-cache/dev-python/flask-whooshalchemy-0.56
index 4a98e12ce945..5235cd79ff3c 100644
--- a/metadata/md5-cache/dev-python/flask-whooshalchemy-0.56
+++ b/metadata/md5-cache/dev-python/flask-whooshalchemy-0.56
@@ -4,7 +4,7 @@ DESCRIPTION=Whoosh extension to Flask/SQLAlchemy
 EAPI=5
 HOMEPAGE=https://github.com/gyllstromk/Flask-WhooshAlchemy https://pypi.python.org/pypi/Flask-WhooshAlchemy
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/whoosh[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WhooshAlchemy/Flask-WhooshAlchemy-0.56.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=327f8029d40e924dbe2a441bb8b44052
+_md5_=f4a12d1d05f81799c40b12a0c681fc2a
diff --git a/metadata/md5-cache/dev-python/flask-xml-rpc-0.1.2-r1 b/metadata/md5-cache/dev-python/flask-xml-rpc-0.1.2-r1
index 6c6bc93852ca..e5af12312be1 100644
--- a/metadata/md5-cache/dev-python/flask-xml-rpc-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/flask-xml-rpc-0.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=XML-RPC support for Flask applications
 EAPI=5
 HOMEPAGE=http://packages.python.org/Flask-XML-RPC/ http://pypi.python.org/pypi/Flask-XML-RPC
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[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/F/Flask-XML-RPC/Flask-XML-RPC-0.1.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9f9a28dd885ac20a0eb8d69f65249b9e
+_md5_=ce8dfe4a19dde338edc4ddc006431f74
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.11-r1 b/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
index 5e58271e2223..de23ddafebf4 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Freezes a Flask application into a set of static files
 EAPI=5
 HOMEPAGE=https://github.com/SimonSapin/Frozen-Flask http://pypi.python.org/pypi/Frozen-Flask
 IUSE=doc test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.7[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/F/Frozen-Flask/Frozen-Flask-0.11.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fc88e0086d3aa52f7dd91f4ce1b67000
+_md5_=25ede9b4b5ab48d3c96cae7d12c1e874
diff --git a/metadata/md5-cache/dev-python/fudge-1.0.3-r2 b/metadata/md5-cache/dev-python/fudge-1.0.3-r2
index 315888fcb293..267c09ea7e63 100644
--- a/metadata/md5-cache/dev-python/fudge-1.0.3-r2
+++ b/metadata/md5-cache/dev-python/fudge-1.0.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Replace real objects with fakes (mocks, stubs, etc) while testing
 EAPI=5
 HOMEPAGE=http://farmdev.com/projects/fudge/ http://pypi.python.org/pypi/fudge
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-1.0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e5b072b462b2a40bdb3d6f6a47924266
+_md5_=54c3471a7e928cb51673979ec6bc9245
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
index 4fad9a169549..637aa22ed89f 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=Recursive descent parsing library based on functional combinators
 EAPI=5
 HOMEPAGE=https://code.google.com/p/funcparserlib/ https://pypi.python.org/pypi/funcparserlib
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7aa0cc2bf4cfe9868a46ba09064c8023
+_md5_=05af3542ff619ae494f4ef9315c1ddc3
diff --git a/metadata/md5-cache/dev-python/funcsigs-0.4 b/metadata/md5-cache/dev-python/funcsigs-0.4
index 9d62bf27c0fd..b97951a193a4 100644
--- a/metadata/md5-cache/dev-python/funcsigs-0.4
+++ b/metadata/md5-cache/dev-python/funcsigs-0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python function signatures from PEP362 for Python 2.7
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/funcsigs
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-0.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=47f94615051198865b6099ad02c9e7af
+_md5_=2679bbf294cc18336dc527dd24f14dd3
diff --git a/metadata/md5-cache/dev-python/functest-0.8.8-r1 b/metadata/md5-cache/dev-python/functest-0.8.8-r1
index 757b44eec28f..2d281a14a8b3 100644
--- a/metadata/md5-cache/dev-python/functest-0.8.8-r1
+++ b/metadata/md5-cache/dev-python/functest-0.8.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Functest is a test tool/framework for testing in Python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/functest/ http://pypi.python.org/pypi/functest
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/functest/functest-0.8.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=443a87a02ff1419634d3a665655c81cc
+_md5_=2044bd69e56dbaeba404930f1b825e4b
diff --git a/metadata/md5-cache/dev-python/fusil-1.5 b/metadata/md5-cache/dev-python/fusil-1.5
index 8c612b3861f3..dba837073047 100644
--- a/metadata/md5-cache/dev-python/fusil-1.5
+++ b/metadata/md5-cache/dev-python/fusil-1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Fusil the fuzzer is a Python library used to write fuzzing programs
 EAPI=5
 HOMEPAGE=http://bitbucket.org/haypo/fusil/wiki/Home http://pypi.python.org/pypi/fusil
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/python-ptrace-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/fusil/fusil-1.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=10c8361b78ef9046a3db457771633abf
+_md5_=a113bb53b16f6b9e9f1acdf16c75d789
diff --git a/metadata/md5-cache/dev-python/futures-2.2.0 b/metadata/md5-cache/dev-python/futures-2.2.0
index d574d9488a97..673085de7b4d 100644
--- a/metadata/md5-cache/dev-python/futures-2.2.0
+++ b/metadata/md5-cache/dev-python/futures-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of the concurrent.futures package from Python 3.2
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pythonfutures http://pypi.python.org/pypi/futures
 IUSE=doc python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/futures/futures-2.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3092c8f6d10c52a833a8242794a5ea3e
+_md5_=53e5d0d94b5da7c79d48e25f304d184b
diff --git a/metadata/md5-cache/dev-python/g-pypi-0.3 b/metadata/md5-cache/dev-python/g-pypi-0.3
index 560eabf673e1..5503a8db3213 100644
--- a/metadata/md5-cache/dev-python/g-pypi-0.3
+++ b/metadata/md5-cache/dev-python/g-pypi-0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Manages ebuilds using information from Python Package Index
 EAPI=4
 HOMEPAGE=https://github.com/iElectric/g-pypi
 IUSE=doc test test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit app-portage/gentoolkit-dev app-portage/metagen >=dev-python/jaxml-3.02 dev-python/setuptools dev-python/jinja dev-python/pygments dev-python/sphinxcontrib-googleanalytics dev-python/unittest2 dev-python/yolk || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://pypi/g/g-pypi/g-pypi-0.3.tar.gz
 _eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d10e7cae8da1946f1ad03400b06f2e5b
+_md5_=37c7ba048bbeda35bed44ecd4bba9963
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1
index f0dd0b978fef..95d9cc8d4e72 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto li
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/gcs-oauth2-boto-plugin
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.29.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-api-python-client-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/socksipy-1.01[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/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=56cbc038077d366876f562bfabf9183a
+_md5_=bada8c1ec9a1b05d8766d99300be23a4
diff --git a/metadata/md5-cache/dev-python/geopy-1.8.1 b/metadata/md5-cache/dev-python/geopy-1.8.1
index 75e5242f5e9e..777ab232193e 100644
--- a/metadata/md5-cache/dev-python/geopy-1.8.1
+++ b/metadata/md5-cache/dev-python/geopy-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Geocoding Toolbox for Python
 EAPI=5
 HOMEPAGE=http://www.geopy.org/ https://github.com/geopy/geopy
 IUSE=test doc yahoo python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=yahoo? ( >=dev-python/requests-oauthlib-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/placefinder[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/geopy/geopy/archive/1.8.1.tar.gz -> geopy-1.8.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=311fa41a4cf46dcfda8371e9fa81af02
+_md5_=19d421fa0f0af087edb5729d60ab9c2e
diff --git a/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1 b/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1
index 8831989afd68..c3f6e9fa6e26 100644
--- a/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1
+++ b/metadata/md5-cache/dev-python/gevent-socketio-0.3.5_rc2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=SocketIO server based on the Gevent pywsgi server
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/gevent-socketio/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/gevent-websocket[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/g/gevent-socketio/gevent-socketio-0.3.5-rc2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ef8df01eb8674104acac008c98b6be34
+_md5_=6195d83b6832c33b52d1ab402a1ec8ea
diff --git a/metadata/md5-cache/dev-python/gevent-websocket-0.9.3 b/metadata/md5-cache/dev-python/gevent-websocket-0.9.3
index 175e6a5e838d..d10f9319ef8e 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.9.3
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.9.3
@@ -4,11 +4,11 @@ DESCRIPTION=Websocket handler for the gevent pywsgi server
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/gevent-websocket/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=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/g/gevent-websocket/gevent-websocket-0.9.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c15263b6e3c100ec6f2a39db00cfaa85
+_md5_=80047bc6016895d3d088f6a950c0d2ec
diff --git a/metadata/md5-cache/dev-python/gevent-zeromq-0.2.5-r1 b/metadata/md5-cache/dev-python/gevent-zeromq-0.2.5-r1
index 832ed1bf06f2..ff40b272dcfc 100644
--- a/metadata/md5-cache/dev-python/gevent-zeromq-0.2.5-r1
+++ b/metadata/md5-cache/dev-python/gevent-zeromq-0.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Gevent compatibility layer for pyzmq
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/gevent_zeromq/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=~dev-python/pyzmq-2.2.0.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/g/gevent_zeromq/gevent_zeromq-0.2.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1c3c72ec62197118f1db12b002f1f11d
+_md5_=dcb1b034a8bf6e7716181e1f4b783555
diff --git a/metadata/md5-cache/dev-python/git-python-0.3.6 b/metadata/md5-cache/dev-python/git-python-0.3.6
index 2adf8c8158f1..f1db0abd2dec 100644
--- a/metadata/md5-cache/dev-python/git-python-0.3.6
+++ b/metadata/md5-cache/dev-python/git-python-0.3.6
@@ -4,7 +4,7 @@ DESCRIPTION=Library used to interact with Git repositories
 EAPI=5
 HOMEPAGE=http://gitorious.org/git-python http://pypi.python.org/pypi/GitPython
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-vcs/git >=dev-python/gitdb-0.6.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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-0.3.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f31d1e06c23661a3419fe68e91536a27
+_md5_=ff01a0aa35f8ce9f84f14df13386115a
diff --git a/metadata/md5-cache/dev-python/gitdb-0.6.4 b/metadata/md5-cache/dev-python/gitdb-0.6.4
index 3033b9e5f5f8..f506d3337543 100644
--- a/metadata/md5-cache/dev-python/gitdb-0.6.4
+++ b/metadata/md5-cache/dev-python/gitdb-0.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=GitDB is a pure-Python git object database
 EAPI=5
 HOMEPAGE=https://github.com/gitpython-developers/gitdb http://pypi.python.org/pypi/gitdb
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-vcs/git >=dev-python/smmap-0.8.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(-)] 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/g/gitdb/gitdb-0.6.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=33e18872e050c1841cb4dcf3255bf6b6
+_md5_=7a73e7c8a5d0b756aa161ab42c3cdb40
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.3.1 b/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
index 832f1c5250b8..ec04aa47ac6b 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Google API Client for Python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/python-gflags[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/oauth2client[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/simplejson[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/uritemplate[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.3.1.tar.gz -> google-api-python-client-1.3.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=dcad816f9e5e55eb2071898522afabf7
+_md5_=bca8fa0f2d856d93261eda1fd6e5a48b
diff --git a/metadata/md5-cache/dev-python/google-apputils-0.4.0 b/metadata/md5-cache/dev-python/google-apputils-0.4.0
index c18ce5294965..75fe0733525a 100644
--- a/metadata/md5-cache/dev-python/google-apputils-0.4.0
+++ b/metadata/md5-cache/dev-python/google-apputils-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of utilities for building Python applications
 EAPI=5
 HOMEPAGE=http://code.google.com/p/google-apputils-python/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[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=http://google-apputils-python.googlecode.com/files/google-apputils-0.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9abaffb02d9b58fecdadf1b4009c871d
+_md5_=f1798adcbd9c0dd088b884b481affead
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.2.36-r1 b/metadata/md5-cache/dev-python/graph-tool-2.2.36-r1
index 1b8cc221df9c..114eb15c78cd 100644
--- a/metadata/md5-cache/dev-python/graph-tool-2.2.36-r1
+++ b/metadata/md5-cache/dev-python/graph-tool-2.2.36-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An efficient python module for manipulation and statistical analysis
 EAPI=5
 HOMEPAGE=http://graph-tool.skewed.de/
 IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-libs/boost-1.54.0[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=sci-mathematics/cgal-3.5 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 SLOT=0
 SRC_URI=http://downloads.skewed.de/graph-tool/graph-tool-2.2.36.tar.bz2
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fbb8ea91a90b2266cd60f0838d1e11aa
+_md5_=4522e28a7bab21958173b03161b9feeb
diff --git a/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1 b/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
index e567c225f50b..bc73ba427748 100644
--- a/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
+++ b/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Interactive Graph (network) Visualization
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/graphcanvas
 IUSE=examples python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/networkx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/enable-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=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ets/graphcanvas-4.0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=06246f9518ddbc95e084532afd01a259
+_md5_=a9bf04834f440d06cdad8f4b7ee3e477
diff --git a/metadata/md5-cache/dev-python/graphy-1.0-r1 b/metadata/md5-cache/dev-python/graphy-1.0-r1
index 261ce4d0a4db..0fa50957551a 100644
--- a/metadata/md5-cache/dev-python/graphy-1.0-r1
+++ b/metadata/md5-cache/dev-python/graphy-1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Chart Library for Python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/graphy/
 IUSE=examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://graphy.googlecode.com/files/graphy_1.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b7dd11fc91c6163c46eb8fc85419d233
+_md5_=5e1e8a822aa58689e4eb0197d0011cde
diff --git a/metadata/md5-cache/dev-python/guppy-0.1.10-r1 b/metadata/md5-cache/dev-python/guppy-0.1.10-r1
index 51b4844b082c..93fa0577dbd9 100644
--- a/metadata/md5-cache/dev-python/guppy-0.1.10-r1
+++ b/metadata/md5-cache/dev-python/guppy-0.1.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Guppy-PE -- A Python Programming Environment
 EAPI=5
 HOMEPAGE=http://guppy-pe.sourceforge.net/ http://pypi.python.org/pypi/guppy
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guppy/guppy-0.1.10.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b2df0322b6863e9bd67cdffefa8c3a19
+_md5_=b2c541436648838a8ed538cff3d9586a
diff --git a/metadata/md5-cache/dev-python/h5py-2.3.1 b/metadata/md5-cache/dev-python/h5py-2.3.1
index b08ac18b796a..155ba645c326 100644
--- a/metadata/md5-cache/dev-python/h5py-2.3.1
+++ b/metadata/md5-cache/dev-python/h5py-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Python interface to HDF5 files
 EAPI=5
 HOMEPAGE=http://www.h5py.org/
 IUSE=test examples mpi python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[mpi=] dev-python/numpy[python_targets_python2_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/h/h5py/h5py-2.3.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=faa67aa235fd1e3311d0f340691f120e
+_md5_=389bf5fb324b5a13b891b2bc1b7d148a
diff --git a/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1 b/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
index 18bd004d631d..35a75d0d8984 100644
--- a/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
+++ b/metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Core of Hachoir framework: parse and edit binary files
 EAPI=5
 HOMEPAGE=http://bitbucket.org/haypo/hachoir/wiki/hachoir-core http://pypi.python.org/pypi/hachoir-core
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-core/hachoir-core-1.3.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3c589a963813943e5bb9d28cfa249430
+_md5_=7f479f6fcbd9b38a8f48d4539f77e2c5
diff --git a/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1 b/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1
index 9e872f7e115f..2bffbd63d7dc 100644
--- a/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/hachoir-parser-1.3.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Package of Hachoir parsers used to open binary files
 EAPI=5
 HOMEPAGE=http://bitbucket.org/haypo/hachoir/wiki/hachoir-parser http://pypi.python.org/pypi/hachoir-parser
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-parser/hachoir-parser-1.3.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=cc5c18b86cc70d701c8f492a2215a5b3
+_md5_=1f31704cb1bbdfc8acb53498423e176b
diff --git a/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1 b/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1
index 56f5ec0657db..4d5534792de5 100644
--- a/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/hachoir-regex-1.0.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Manipulation of regular expressions (regex)
 EAPI=5
 HOMEPAGE=http://bitbucket.org/haypo/hachoir/wiki/hachoir-regex http://pypi.python.org/pypi/hachoir-regex
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-regex/hachoir-regex-1.0.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9da40bb69e8c3ec0b38a1e999cfe6ba4
+_md5_=9ba66b00729b398f4bfd3316cc58c52e
diff --git a/metadata/md5-cache/dev-python/hacking-0.10.1 b/metadata/md5-cache/dev-python/hacking-0.10.1
index 3434469d9809..022b5b3b5efd 100644
--- a/metadata/md5-cache/dev-python/hacking-0.10.1
+++ b/metadata/md5-cache/dev-python/hacking-0.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Nova API
 EAPI=5
 HOMEPAGE=https://github.com/openstack-dev/hacking
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/pep8-1.5.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/pyflakes-0.8.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/flake8-2.2.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/mccabe-0.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/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/h/hacking/hacking-0.10.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d6c34f027513c994b61f90cb4b4e1c2a
+_md5_=03bb007e02d0ac59f451fb71087c0647
diff --git a/metadata/md5-cache/dev-python/hacking-0.8.1 b/metadata/md5-cache/dev-python/hacking-0.8.1
index 6034f5648373..f29e77ba90b8 100644
--- a/metadata/md5-cache/dev-python/hacking-0.8.1
+++ b/metadata/md5-cache/dev-python/hacking-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Nova API
 EAPI=5
 HOMEPAGE=https://github.com/openstack-dev/hacking
 IUSE=doc test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/pep8-1.4.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pyflakes-0.7.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/pyflakes-0.7.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ~dev-python/flake8-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/six-1.4.1[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/h/hacking/hacking-0.8.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6b0c7b4453724313bfb58c4031e2cbd3
+_md5_=a62bcdcc1ec938f494c7a604d97a556c
diff --git a/metadata/md5-cache/dev-python/hacking-0.9.2 b/metadata/md5-cache/dev-python/hacking-0.9.2
index 75e2e5dc5cee..d2127801e905 100644
--- a/metadata/md5-cache/dev-python/hacking-0.9.2
+++ b/metadata/md5-cache/dev-python/hacking-0.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Nova API
 EAPI=5
 HOMEPAGE=https://github.com/openstack-dev/hacking
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/pep8-1.5.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/pyflakes-0.8.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/flake8-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/six-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/h/hacking/hacking-0.9.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fcba407d6e52284218e26e54764b5d0e
+_md5_=6230b9eef82df0fcc8ece0b3850eb835
diff --git a/metadata/md5-cache/dev-python/happydoc-3.1-r2 b/metadata/md5-cache/dev-python/happydoc-3.1-r2
index 6bfd924d9132..6c1bd98ad885 100644
--- a/metadata/md5-cache/dev-python/happydoc-3.1-r2
+++ b/metadata/md5-cache/dev-python/happydoc-3.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Tool for extracting documentation from Python source code
 EAPI=5
 HOMEPAGE=http://happydoc.sourceforge.net/
 IUSE=doc python_targets_python2_7 python_targets_pypy
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86
 LICENSE=HPND ZPL
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/happydoc/HappyDoc_r3_1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fe724c1e0ab3df265c31a78c695c2cb6
+_md5_=400da26f342364e32aa1e5c02bfc2bd3
diff --git a/metadata/md5-cache/dev-python/hcs-utils-1.5 b/metadata/md5-cache/dev-python/hcs-utils-1.5
index f549edc47a87..2f595b4c13c1 100644
--- a/metadata/md5-cache/dev-python/hcs-utils-1.5
+++ b/metadata/md5-cache/dev-python/hcs-utils-1.5
@@ -4,11 +4,11 @@ DESCRIPTION=A library containing some useful snippets
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/hcs_utils
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hcs_utils/hcs_utils-1.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=06f0bd1416d9e9da83cd687886555b10
+_md5_=8ffd0f97912fd1a58cffd1c89526b68e
diff --git a/metadata/md5-cache/dev-python/hgtools-6.0 b/metadata/md5-cache/dev-python/hgtools-6.0
index de28be464d1b..49e564c26aab 100644
--- a/metadata/md5-cache/dev-python/hgtools-6.0
+++ b/metadata/md5-cache/dev-python/hgtools-6.0
@@ -4,11 +4,11 @@ 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_pypy
-KEYWORDS=amd64 ~x86
+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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgtools/hgtools-6.0.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=40dce7c5a013fa504daf9d3ca885a0d4
+_md5_=9bf70c4abbe94215044be8053f60f2f0
diff --git a/metadata/md5-cache/dev-python/hiredis-0.1.1-r2 b/metadata/md5-cache/dev-python/hiredis-0.1.1-r2
index be93c9c98339..527689303a20 100644
--- a/metadata/md5-cache/dev-python/hiredis-0.1.1-r2
+++ b/metadata/md5-cache/dev-python/hiredis-0.1.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python extension that wraps hiredis
 EAPI=5
 HOMEPAGE=https://github.com/pietern/hiredis-py
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=dev-libs/hiredis 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/h/hiredis/hiredis-0.1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8390cb89dc54558fefbcf6a86edd844d
+_md5_=5641b5e13b2132af9b4cdd34c06d5aac
diff --git a/metadata/md5-cache/dev-python/http-parser-0.8.3 b/metadata/md5-cache/dev-python/http-parser-0.8.3
index f503e8557c96..0c20d17f99f3 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.8.3
+++ b/metadata/md5-cache/dev-python/http-parser-0.8.3
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP request/response parser for python in C
 EAPI=5
 HOMEPAGE=http://github.com/benoitc/http-parser
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 x86 ~x86-fbsd
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/h/http-parser/http-parser-0.8.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7b3f7f7ee62ea388361aac1ad58ccb8e
+_md5_=3e68263864fa3da54238c89ad54556a6
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.0 b/metadata/md5-cache/dev-python/httpretty-0.8.0
index 460a7db08796..0ad7bb7bd882 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.0
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client mock for Python
 EAPI=5
 HOMEPAGE=http://github.com/gabrielfalcao/httpretty
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python2_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/h/httpretty/httpretty-0.8.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=52864b55a12f57b959764b9eaf05ea37
+_md5_=68054388abc9048e3a8f1fb41926a97e
diff --git a/metadata/md5-cache/dev-python/iconvcodec-1.1.2-r1 b/metadata/md5-cache/dev-python/iconvcodec-1.1.2-r1
index 3c110ba47ea7..1a5ab8d45d0e 100644
--- a/metadata/md5-cache/dev-python/iconvcodec-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/iconvcodec-1.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Codecs for Iconv Encodings
 EAPI=5
 HOMEPAGE=http://cjkpython.i18n.org/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=LGPL-2.1
 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://berlios/cjkpython/iconvcodec-1.1.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=679d801331d971eb32cd397ce7f342f4
+_md5_=be126353da2f84cbc12fb90c4cee3b28
diff --git a/metadata/md5-cache/dev-python/ijson-2.0 b/metadata/md5-cache/dev-python/ijson-2.0
index d7034a5d7141..918aa2754428 100644
--- a/metadata/md5-cache/dev-python/ijson-2.0
+++ b/metadata/md5-cache/dev-python/ijson-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Iterative JSON parser with a Pythonic interface
 EAPI=5
 HOMEPAGE=https://github.com/isagalaev/ijson http://pypi.python.org/pypi/ijson/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/yajl 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/i/ijson/ijson-2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1c0d94ff01e4c29105e337218a7088cb
+_md5_=e23bd720c94e8af44dba4718bde6f849
diff --git a/metadata/md5-cache/dev-python/imaging-1.1.7-r5 b/metadata/md5-cache/dev-python/imaging-1.1.7-r5
index f93ee0e82583..289822b58206 100644
--- a/metadata/md5-cache/dev-python/imaging-1.1.7-r5
+++ b/metadata/md5-cache/dev-python/imaging-1.1.7-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Python Imaging Library (PIL)
 EAPI=5
 HOMEPAGE=http://www.pythonware.com/products/pil/index.htm
 IUSE=doc examples jpeg scanner test tiff tk truetype zlib python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=HPND
 RDEPEND=truetype? ( media-libs/freetype:2 ) jpeg? ( virtual/jpeg ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff ) zlib? ( sys-libs/zlib ) !dev-python/pillow !dev-python/pillow python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=test? ( jpeg tiff zlib ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.effbot.org/downloads/Imaging-1.1.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1f05b8867ce2f330a88182c76029092b
+_md5_=38891c110be29e0b38f2d912064fd2cb
diff --git a/metadata/md5-cache/dev-python/imapclient-0.12 b/metadata/md5-cache/dev-python/imapclient-0.12
index 28048983281e..d265879aeda7 100644
--- a/metadata/md5-cache/dev-python/imapclient-0.12
+++ b/metadata/md5-cache/dev-python/imapclient-0.12
@@ -4,11 +4,11 @@ DESCRIPTION=easy-to-use, pythonic, and complete IMAP client library
 EAPI=5
 HOMEPAGE=http://imapclient.freshfoo.com/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/I/IMAPClient/IMAPClient-0.12.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0fcfabbdb6b45b8e30b2d59618bac820
+_md5_=399ff371970bbb1facfbe4a2ea26560b
diff --git a/metadata/md5-cache/dev-python/importing-1.10 b/metadata/md5-cache/dev-python/importing-1.10
index a56c7bdedaa9..29806e105158 100644
--- a/metadata/md5-cache/dev-python/importing-1.10
+++ b/metadata/md5-cache/dev-python/importing-1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Import objects dynamically, lazily, weakly, and more
 EAPI=5
 HOMEPAGE=http://peak.telecommunity.com/DevCenter/Importing
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZPL
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/I/Importing/Importing-1.10.zip -> importing-1.10.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=dceca01c301b4a860e03ad892b0045ac
+_md5_=f77da150a14cea1f996e61b0dd4a4f64
diff --git a/metadata/md5-cache/dev-python/into-0.1.3 b/metadata/md5-cache/dev-python/into-0.1.3
index 07aacf21afd3..f5654866de09 100644
--- a/metadata/md5-cache/dev-python/into-0.1.3
+++ b/metadata/md5-cache/dev-python/into-0.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Data migration utilities
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/into
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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 ) >=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/i/into/into-0.1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e92954dc2bb402dd1a11b90a265ed614
+_md5_=63983451da48125660268ad0d93aa085
diff --git a/metadata/md5-cache/dev-python/ioflo-1.0.2 b/metadata/md5-cache/dev-python/ioflo-1.0.2
index acd2fff2237c..9d75dee358e0 100644
--- a/metadata/md5-cache/dev-python/ioflo-1.0.2
+++ b/metadata/md5-cache/dev-python/ioflo-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Automated Reasoning Engine and Flow Based Programming Framework
 EAPI=5
 HOMEPAGE=https://github.com/ioflo/ioflo/
 IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v1.0.2.tar.gz -> ioflo-1.0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4afe6d24273d5dfba8eea01ccbcf836d
+_md5_=c71a0fff57c1bd76d6514f56b5e1424c
diff --git a/metadata/md5-cache/dev-python/ipcalc-1.1.3 b/metadata/md5-cache/dev-python/ipcalc-1.1.3
index cab5f9693fe2..b25e1798e14e 100644
--- a/metadata/md5-cache/dev-python/ipcalc-1.1.3
+++ b/metadata/md5-cache/dev-python/ipcalc-1.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=IP subnet calculator
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/ipcalc/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipcalc/ipcalc-1.1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a4507921c18db34fa047445b6ac3afa3
+_md5_=611df13f402bae1555411d1512ea7936
diff --git a/metadata/md5-cache/dev-python/ipdb-0.8 b/metadata/md5-cache/dev-python/ipdb-0.8
index 2334ed66addc..01845083f2fc 100644
--- a/metadata/md5-cache/dev-python/ipdb-0.8
+++ b/metadata/md5-cache/dev-python/ipdb-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=IPython-enabled pdb
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/ipdb
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/ipython[python_targets_python2_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/i/ipdb/ipdb-0.8.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6129fd5fe1b47752ea65ef2847348e55
+_md5_=3e4d3f8aedd7c5fe209c5d21c7d5652a
diff --git a/metadata/md5-cache/dev-python/ipython-2.2.0 b/metadata/md5-cache/dev-python/ipython-2.2.0
index 6d5bafe80b9e..6a44d584463e 100644
--- a/metadata/md5-cache/dev-python/ipython-2.2.0
+++ b/metadata/md5-cache/dev-python/ipython-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=5
 HOMEPAGE=http://ipython.org/
 IUSE=doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
-KEYWORDS=amd64 arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/simplegeneric[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) octave? ( dev-python/oct2py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) smp? ( >=dev-python/pyzmq-2.1.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(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) notebook? ( >=www-servers/tornado-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/pygments[python_targets_python2_7(-)?,python_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-2.1.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/jinja[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/mathjax ) nbconvert? ( >=app-text/pandoc-1.12.1 dev-python/pygments[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) qt4? ( || ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-python/pygments[python_targets_python2_7(-)?,python_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-2.1.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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline,sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite] ) >=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=doc? ( matplotlib mongodb octave ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-2.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c1f3e15568887dee82fcbc866827678c
+_md5_=33b1659e5f152b34bbede6faf9e4bc41
diff --git a/metadata/md5-cache/dev-python/irc-11.0.1 b/metadata/md5-cache/dev-python/irc-11.0.1
index f05564bc37b8..a8b57d733889 100644
--- a/metadata/md5-cache/dev-python/irc-11.0.1
+++ b/metadata/md5-cache/dev-python/irc-11.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=IRC client framework written in Python
 EAPI=5
 HOMEPAGE=https://bitbucket.org/jaraco/irc http://pypi.python.org/pypi/irc
 IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=!>=dev-python/python-irclib-3.2.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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/jaraco-utils[python_targets_python2_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/i/irc/irc-11.0.1.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8475ac1c9de82ec267b8c72319c28690
+_md5_=28a8beb5a8715c0a4246912fbf166b6b
diff --git a/metadata/md5-cache/dev-python/irman-python-0.1-r1 b/metadata/md5-cache/dev-python/irman-python-0.1-r1
index d3137d91d82b..320f7bfddc8f 100644
--- a/metadata/md5-cache/dev-python/irman-python-0.1-r1
+++ b/metadata/md5-cache/dev-python/irman-python-0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A minimal set of Python bindings for libirman
 EAPI=5
 HOMEPAGE=http://bluweb.com/chouser/proj/irman-python/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libirman 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=http://bluweb.com/chouser/proj/irman-python/irman-python-0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6c171006c25cea4f2e25bad4d0cc9b5a
+_md5_=767175d844a7defe7aa105de30733166
diff --git a/metadata/md5-cache/dev-python/jaraco-utils-10.0.2 b/metadata/md5-cache/dev-python/jaraco-utils-10.0.2
index 3da7d6c288b1..581d6512c1a1 100644
--- a/metadata/md5-cache/dev-python/jaraco-utils-10.0.2
+++ b/metadata/md5-cache/dev-python/jaraco-utils-10.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=General utility modules that supply commonly-used functionality
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/jaraco.util
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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/j/jaraco.util/jaraco.util-10.0.2.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b5481a49430421cdbac7f76136773050
+_md5_=706711e86cd7bdd78ffc714054cc8410
diff --git a/metadata/md5-cache/dev-python/jingo-0.7 b/metadata/md5-cache/dev-python/jingo-0.7
index 2520b869856f..570360bcd2e7 100644
--- a/metadata/md5-cache/dev-python/jingo-0.7
+++ b/metadata/md5-cache/dev-python/jingo-0.7
@@ -4,11 +4,11 @@ DESCRIPTION=An adapter for using Jinja2 templates with Django
 EAPI=5
 HOMEPAGE=http://github.com/jbalogh/jingo/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/j/jingo/jingo-0.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e7e144b7512fbf363757d1ea591884a8
+_md5_=7f92905fe1b095cb6a6a24465d1a681b
diff --git a/metadata/md5-cache/dev-python/joblib-0.8.4 b/metadata/md5-cache/dev-python/joblib-0.8.4
index 698d9156ef6f..ed3a9e16b020 100644
--- a/metadata/md5-cache/dev-python/joblib-0.8.4
+++ b/metadata/md5-cache/dev-python/joblib-0.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=Tools to provide lightweight pipelining in Python
 EAPI=5
 HOMEPAGE=http://pythonhosted.org/joblib/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/j/joblib/joblib-0.8.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=97da31d2cc04e8339f97d7c7a0703f72
+_md5_=1d5da5fb3fa16d47d074d668c639860c
diff --git a/metadata/md5-cache/dev-python/jonpy-0.11 b/metadata/md5-cache/dev-python/jonpy-0.11
index b02dbc8b4d37..db371f95ddec 100644
--- a/metadata/md5-cache/dev-python/jonpy-0.11
+++ b/metadata/md5-cache/dev-python/jonpy-0.11
@@ -4,11 +4,11 @@ DESCRIPTION=Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-
 EAPI=5
 HOMEPAGE=http://jonpy.sourceforge.net/ http://pypi.python.org/pypi/jonpy
 IUSE=doc examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/j/jonpy/jonpy-0.11.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0caa0a59881b019e477ef0e655646016
+_md5_=bece685db401698e0a41d0d257d657c7
diff --git a/metadata/md5-cache/dev-python/jsmin-2.0.9 b/metadata/md5-cache/dev-python/jsmin-2.0.9
index c2ba553c0ac7..2c2bf607e62f 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.0.9
+++ b/metadata/md5-cache/dev-python/jsmin-2.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=JavaScript minifier
 EAPI=5
 HOMEPAGE=https://bitbucket.org/dcs/jsmin/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.0.9.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=cabfe9257f2d749e09a56410990829f8
+_md5_=888eef46eb0076e0d8ebdd93791c9e6c
diff --git a/metadata/md5-cache/dev-python/json-tools-0.3.3 b/metadata/md5-cache/dev-python/json-tools-0.3.3
index 1f8fbd4e4cf7..5fb64a96030a 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.3.3
+++ b/metadata/md5-cache/dev-python/json-tools-0.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=A set of tools to manipulate JSON: diff, patch, and pretty-printing
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.3.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=197c31d88ff7310bfc16ea53e250a328
+_md5_=8c151d306245a89cd158c3cbc854d582
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.9 b/metadata/md5-cache/dev-python/jsonpatch-1.9
index 00b4d141e319..5dd8ba943c78 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.9
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.9
@@ -4,11 +4,11 @@ DESCRIPTION=Apply JSON-Patches according to http://tools.ietf.org/html/draft-pbr
 EAPI=5
 HOMEPAGE=https://github.com/stefankoegl/python-json-patch
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonpointer-1.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.9.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1d74c6633ca05ac6b8a3c148c71a1fd8
+_md5_=b48a6f9ea6087dd7667cd344fd67825f
diff --git a/metadata/md5-cache/dev-python/jsonpickle-0.8.0 b/metadata/md5-cache/dev-python/jsonpickle-0.8.0
index 9211384389cf..83ea5a5e5deb 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-0.8.0
+++ b/metadata/md5-cache/dev-python/jsonpickle-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
 EAPI=5
 HOMEPAGE=http://jsonpickle.github.com/ http://pypi.python.org/pypi/jsonpickle
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/feedparser[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ujson[python_targets_python2_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/j/jsonpickle/jsonpickle-0.8.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=475d084f59cfbfbad95d994a86b21fb0
+_md5_=a549af033844bb56992f6996b1bf20e3
diff --git a/metadata/md5-cache/dev-python/jsonpointer-1.7 b/metadata/md5-cache/dev-python/jsonpointer-1.7
index c2ea0d25dd0c..39257adc5412 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-1.7
+++ b/metadata/md5-cache/dev-python/jsonpointer-1.7
@@ -4,11 +4,11 @@ DESCRIPTION=Identify specific nodes in a JSON document (according to draft 08)
 EAPI=5
 HOMEPAGE=https://github.com/stefankoegl/python-json-pointer https://pypi.python.org/pypi/jsonpointer/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-1.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=202814bad033847908b15acdd9c4b750
+_md5_=fbf47663eba724d5a78fcc1a6d95da88
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1 b/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1
index 37468f5bd5aa..1ead549a5e16 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0_pre20110820-r1
@@ -4,11 +4,11 @@ DESCRIPTION=python implementation of the JSON-RPC spec (1.0 and 2.0)
 EAPI=5
 HOMEPAGE=https://github.com/joshmarshall/jsonrpclib
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson 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://gentoo/jsonrpclib-0_pre20110820.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=93668676415385c403988f44aa774fd0
+_md5_=5f03f014657202906f0612194b8be7fb
diff --git a/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1 b/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1
index 1f7081fa2801..b4effcef0996 100644
--- a/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1
+++ b/metadata/md5-cache/dev-python/kaa-metadata-0.7.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Powerful media metadata parser for media files in Python, successor
 EAPI=5
 HOMEPAGE=http://freevo.sourceforge.net/kaa/
 IUSE=css dvd python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/kaa-base-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] css? ( media-libs/libdvdcss ) dvd? ( media-libs/libdvdread ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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/freevo/kaa-metadata-0.7.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=12f783a4766e713fc57c980f31760a83
+_md5_=4f1ef2f2739c1564c503ea450c0b4ab3
diff --git a/metadata/md5-cache/dev-python/kazoo-2.0 b/metadata/md5-cache/dev-python/kazoo-2.0
index 97016421169d..cedf60d71d30 100644
--- a/metadata/md5-cache/dev-python/kazoo-2.0
+++ b/metadata/md5-cache/dev-python/kazoo-2.0
@@ -4,7 +4,7 @@ DESCRIPTION=A high-level Python library that makes it easier to use Apache Zooke
 EAPI=5
 HOMEPAGE=https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.python.org/pypi/kazoo/
 IUSE=doc gevent test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=gevent? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/kazoo/kazoo-2.0.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=854a52eb51455002f364fa96cffe17db
+_md5_=8c2f42d8e57174d5d6a41faadc8d9fb3
diff --git a/metadata/md5-cache/dev-python/keyczar-0.715 b/metadata/md5-cache/dev-python/keyczar-0.715
index 02c1bdaef493..3bc40cf646be 100644
--- a/metadata/md5-cache/dev-python/keyczar-0.715
+++ b/metadata/md5-cache/dev-python/keyczar-0.715
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for safe and simple cryptography
 EAPI=5
 HOMEPAGE=http://www.keyczar.org https://pypi.python.org/pypi/python-keyczar/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[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-keyczar/python-keyczar-0.715.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=30dbb3a42754d5a2dd1aec86399c6226
+_md5_=48e67d47013747256567bf0d404dd4ef
diff --git a/metadata/md5-cache/dev-python/kid-0.9.6-r1 b/metadata/md5-cache/dev-python/kid-0.9.6-r1
index d89785b8e909..871b09c15760 100644
--- a/metadata/md5-cache/dev-python/kid-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/kid-0.9.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple and Pythonic XML template language
 EAPI=5
 HOMEPAGE=http://www.kid-templating.org/ http://pypi.python.org/pypi/kid
 IUSE=doc examples test python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 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=http://www.kid-templating.org/dist/0.9.6/kid-0.9.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c5027697106da68b5d11cc6cba69e558
+_md5_=0abfa77a30d0b0b9631763e7763818d5
diff --git a/metadata/md5-cache/dev-python/kombu-3.0.24 b/metadata/md5-cache/dev-python/kombu-3.0.24
index 68ef1ded3285..1ea7cca6c628 100644
--- a/metadata/md5-cache/dev-python/kombu-3.0.24
+++ b/metadata/md5-cache/dev-python/kombu-3.0.24
@@ -4,11 +4,11 @@ DESCRIPTION=AMQP Messaging Framework for Python
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/kombu https://github.com/celery/kombu
 IUSE=amqplib doc examples msgpack sqs test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/py-amqp-1.4.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] <dev-python/py-amqp-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pyro:4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/pyzmq-13.1.0[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_3? ( >=dev-python/pyzmq-13.1.0[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_4? ( >=dev-python/pyzmq-13.1.0[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(-)] ) amqplib? ( >=dev-python/amqplib-1.0.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) sqs? ( >=dev-python/boto-2.13.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=sqs? ( ) doc? ( amqplib sqs ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-3.0.24.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d81b539caea8b760eb15a5f1a13f1cb3
+_md5_=d3f7777d1fc990a5bdca06e8fbd3f52e
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.9j b/metadata/md5-cache/dev-python/lesscpy-0.9j
index d2b927737daa..681d893a5486 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.9j
+++ b/metadata/md5-cache/dev-python/lesscpy-0.9j
@@ -4,11 +4,11 @@ DESCRIPTION=A compiler written in Python for the LESS language
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/lesscpy
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/ply[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/l/lesscpy/lesscpy-0.9j.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6a72bd8bde66bc604a802f79f79989c9
+_md5_=918508dbc559dbb6bf18afe162aafe12
diff --git a/metadata/md5-cache/dev-python/libcloud-0.15.1 b/metadata/md5-cache/dev-python/libcloud-0.15.1
index 4feeb63f2b83..2a421e871b1e 100644
--- a/metadata/md5-cache/dev-python/libcloud-0.15.1
+++ b/metadata/md5-cache/dev-python/libcloud-0.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=Unified Interface to the Cloud - python support libs
 EAPI=5
 HOMEPAGE=http://libcloud.apache.org/index.html
 IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_pypy? ( virtual/pypy:0=[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-0.15.1.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ad001689d51463edcdf1318d7ec977bc
+_md5_=44dac37ac7bf05ca92dbba29689eefa7
diff --git a/metadata/md5-cache/dev-python/libextractor-python-0.6-r1 b/metadata/md5-cache/dev-python/libextractor-python-0.6-r1
index 7929c26fea46..83e8372613a2 100644
--- a/metadata/md5-cache/dev-python/libextractor-python-0.6-r1
+++ b/metadata/md5-cache/dev-python/libextractor-python-0.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A library used to extract metadata from files of arbitrary type
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libextractor/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libextractor-0.6.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://gnu/libextractor/libextractor-python-0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=50a028d3aaf8965e09ddac9c0d6d807c
+_md5_=6d0ba07c3c4c190adbe4c3ef6f7893a4
diff --git a/metadata/md5-cache/dev-python/libnacl-1.4.0 b/metadata/md5-cache/dev-python/libnacl-1.4.0
index 6d8b83aef371..fbfddc52c21c 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.4.0
+++ b/metadata/md5-cache/dev-python/libnacl-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python ctypes wrapper for libsodium
 EAPI=5
 HOMEPAGE=https://libnacl.readthedocs.org/
 IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libsodium 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/l/libnacl/libnacl-1.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2bbbe6c62517f4a03ce008552360a878
+_md5_=5c948e7046262f85a1f759b07d293e67
diff --git a/metadata/md5-cache/dev-python/librharris-0.1.14-r1 b/metadata/md5-cache/dev-python/librharris-0.1.14-r1
index c7221d10e766..4332f1ec5cda 100644
--- a/metadata/md5-cache/dev-python/librharris-0.1.14-r1
+++ b/metadata/md5-cache/dev-python/librharris-0.1.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Internet Programming Library
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/lib_rharris
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lib_rharris/lib_rharris-0.1.14.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4a943c3d2f696487259c56f86f5ceccc
+_md5_=832ab26300c00719fa205bab03723fe3
diff --git a/metadata/md5-cache/dev-python/llfuse-0.40 b/metadata/md5-cache/dev-python/llfuse-0.40
index f92d4c0cecea..f2d4de1c1bbc 100644
--- a/metadata/md5-cache/dev-python/llfuse-0.40
+++ b/metadata/md5-cache/dev-python/llfuse-0.40
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the low-level FUSE API
 EAPI=5
 HOMEPAGE=http://python-llfuse.googlecode.com/ http://pypi.python.org/pypi/llfuse
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=>=sys-fs/fuse-2.8.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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-0.40.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3144fc91cde5b4c05c3291598ef41c1d
+_md5_=0c141ecbb4f429853d93107d23db6b6d
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.2.1 b/metadata/md5-cache/dev-python/llvmlite-0.2.1
index b7cb39c55fbd..f03be1aa3625 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.2.1
+++ b/metadata/md5-cache/dev-python/llvmlite-0.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper around the llvm C++ library
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/llvmlite
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=sys-devel/llvm-3.5:=[multitarget] 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/l/llvmlite/llvmlite-0.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a2a8f9794f80675166d33fe3743c2ad2
+_md5_=50d6c4ed7dc823a99f76e4e9f954fd3a
diff --git a/metadata/md5-cache/dev-python/llvmpy-0.12.7 b/metadata/md5-cache/dev-python/llvmpy-0.12.7
index bfe97bedf43a..72199e85fee0 100644
--- a/metadata/md5-cache/dev-python/llvmpy-0.12.7
+++ b/metadata/md5-cache/dev-python/llvmpy-0.12.7
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper around the llvm C++ library
 EAPI=5
 HOMEPAGE=http://llvmpy.org/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND==sys-devel/llvm-3.3*:=[multitarget] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/llvmpy/llvmpy/archive/0.12.7.tar.gz -> llvmpy-0.12.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=11d904acd9c0521a18eff45d04236f40
+_md5_=e8bd368a08dd78f09feb8aa56b5bdd98
diff --git a/metadata/md5-cache/dev-python/log4py-1.3-r1 b/metadata/md5-cache/dev-python/log4py-1.3-r1
index 5f6229faf942..5a95ddea337a 100644
--- a/metadata/md5-cache/dev-python/log4py-1.3-r1
+++ b/metadata/md5-cache/dev-python/log4py-1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A python logging module similar to log4j
 EAPI=5
 HOMEPAGE=http://www.its4you.at/english/log4py.html
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=MIT
 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=http://www.its4you.at/downloads/files/log4py-1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=60c3a81205a7b96e189a0810ee06ff93
+_md5_=72482d222bd8831c187c626d94ca824d
diff --git a/metadata/md5-cache/dev-python/logilab-common-0.63.2 b/metadata/md5-cache/dev-python/logilab-common-0.63.2
index 5dbdc8dc5486..6ddf0edbb720 100644
--- a/metadata/md5-cache/dev-python/logilab-common-0.63.2
+++ b/metadata/md5-cache/dev-python/logilab-common-0.63.2
@@ -4,11 +4,11 @@ DESCRIPTION=Useful miscellaneous modules used by Logilab projects
 EAPI=5
 HOMEPAGE=http://www.logilab.org/project/logilab-common http://pypi.python.org/pypi/logilab-common
 IUSE=test doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.63.2.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.63.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1c343684cc24400d45aae863b654dae1
+_md5_=7f8bcdf4ae270554f0bdf3a43104f614
diff --git a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1 b/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1
index c8649497f0f8..b6529877b54b 100644
--- a/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/logilab-constraint-0.5.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A finite domain constraints solver written in 100% pure Python
 EAPI=5
 HOMEPAGE=http://www.logilab.org/project/logilab-constraint
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/logilab-common[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=ftp://ftp.logilab.org/pub/constraint/logilab-constraint-0.5.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=71d9a91e409f579d75274c27dad3a4b1
+_md5_=7f91c1fa0493592ff1542ddf2f9e11fc
diff --git a/metadata/md5-cache/dev-python/lupy-0.2.1-r2 b/metadata/md5-cache/dev-python/lupy-0.2.1-r2
index b554de316d27..b0c64131dd41 100644
--- a/metadata/md5-cache/dev-python/lupy-0.2.1-r2
+++ b/metadata/md5-cache/dev-python/lupy-0.2.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Lupy is a is a full-text indexer and search engine written in Python
 EAPI=5
 HOMEPAGE=http://divmod.org/projects/lupy http://pypi.python.org/pypi/Lupy
 IUSE=examples python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~s390 ~x86
+KEYWORDS=amd64 ~ia64 ppc ~s390 x86
 LICENSE=LGPL-2.1
 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/lupy/Lupy-0.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d7778eb056dabfc07b357f315d6b83ff
+_md5_=2e6c95dd7600854b17bdce7baaac1b83
diff --git a/metadata/md5-cache/dev-python/lxml-3.4.1 b/metadata/md5-cache/dev-python/lxml-3.4.1
index 7569dc96361b..16d609707d7c 100644
--- a/metadata/md5-cache/dev-python/lxml-3.4.1
+++ b/metadata/md5-cache/dev-python/lxml-3.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=5
 HOMEPAGE=http://lxml.de/ http://pypi.python.org/pypi/lxml/
 IUSE=beautifulsoup3 doc examples +threads python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.23 beautifulsoup3? ( python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/beautifulsoup:python-3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-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/l/lxml/lxml-3.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9b5a3b562f8c88f4235c4d75654e254f
+_md5_=299e456fd8640ca1cdf92e5902c02100
diff --git a/metadata/md5-cache/dev-python/lz4-0.6.1 b/metadata/md5-cache/dev-python/lz4-0.6.1
index 7d4ca236581f..fc0534c2633d 100644
--- a/metadata/md5-cache/dev-python/lz4-0.6.1
+++ b/metadata/md5-cache/dev-python/lz4-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=LZ4 Bindings for Python
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/lz4 https://github.com/steeve/python-lz4
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-0.6.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6b684aabf32fc18ac93837a55d7b82ee
+_md5_=d8f4778adf600825ceb1cb1effc5f3d1
diff --git a/metadata/md5-cache/dev-python/m2secret-0.1.1-r1 b/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
index a410564260e2..4ec5edc5d2c9 100644
--- a/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Encryption and decryption module and CLI utility
 EAPI=5
 HOMEPAGE=http://www.heikkitoivonen.net/m2secret http://pypi.python.org/pypi/m2secret
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/m2crypto-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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2secret/m2secret-0.1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7172eaaeed1f5c2977d4b28a644da3bd
+_md5_=e535fb842e7a8a697597529c0036efd3
diff --git a/metadata/md5-cache/dev-python/mantissa-0.7.0-r1 b/metadata/md5-cache/dev-python/mantissa-0.7.0-r1
index cfbc09372107..f7e3c800a2d6 100644
--- a/metadata/md5-cache/dev-python/mantissa-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/mantissa-0.7.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An extensible, multi-protocol, multi-user, interactive application s
 EAPI=5
 HOMEPAGE=http://divmod.org/trac/wiki/DivmodMantissa http://pypi.python.org/pypi/Mantissa
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/axiom-0.6.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cssutils-0.9.10-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/nevow-0.10.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2012j[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-mail[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/vertex-0.3.0-r1[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/M/Mantissa/Mantissa-0.7.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a6cb46c79286b3a5120b67cbd8047e22
+_md5_=e577f79e6a193d87fe60173dff7cc013
diff --git a/metadata/md5-cache/dev-python/manuel-1.7.1 b/metadata/md5-cache/dev-python/manuel-1.7.1
index 454e3b672eeb..6f7fa2d91dbe 100644
--- a/metadata/md5-cache/dev-python/manuel-1.7.1
+++ b/metadata/md5-cache/dev-python/manuel-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Manuel lets you build tested documentation
 EAPI=5
 HOMEPAGE=https://github.com/benji-york/manuel/ http://pypi.python.org/pypi/manuel
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZPL
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~idella4/tarballs/manuel-1.7.1-20130316.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0bfeffe9a99a7331ecec29e5d8d62adb
+_md5_=76e1135c414968fd8562be571b1ed71b
diff --git a/metadata/md5-cache/dev-python/markdown2-2.3.0 b/metadata/md5-cache/dev-python/markdown2-2.3.0
index 1000a04e7add..0a6c998be945 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.3.0
+++ b/metadata/md5-cache/dev-python/markdown2-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python Markdown language reimplementation
 EAPI=5
 HOMEPAGE=http://github.com/trentm/python-markdown2
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/m/markdown2/markdown2-2.3.0.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b16a179787a0e3987fc07f6b64c81393
+_md5_=88fe27bb89d6a3f08eae48ce7b65bfd6
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.4.2 b/metadata/md5-cache/dev-python/matplotlib-1.4.2
index cbb6633adfd1..0e092d381547 100644
--- a/metadata/md5-cache/dev-python/matplotlib-1.4.2
+++ b/metadata/md5-cache/dev-python/matplotlib-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=5
 HOMEPAGE=http://matplotlib.org/
 IUSE=cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
-KEYWORDS=amd64 arm ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+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/numpy-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/python-dateutil:0[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_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.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(-)] media-fonts/stix-fonts >=media-libs/freetype-2.3 media-libs/libpng:0 media-libs/qhull gtk? ( dev-libs/glib 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_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] cairo? ( || ( dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ) excel? ( dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fltk? ( dev-python/pyfltk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk3? ( dev-python/pygobject: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(-)] 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_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) qt4? ( dev-python/PyQt4[X,python_targets_python2_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[tk?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[tk?] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?] ) >=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=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) fltk? ( || ( python_targets_python2_7 ) ) gtk? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo fltk latex pyside qt4 tk wxwidgets || ( gtk gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.4.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a2cd8c5746664a1f2a66f6414b2b3909
+_md5_=2f6556533782d6ae7a9125babbe27fb3
diff --git a/metadata/md5-cache/dev-python/meld3-1.0.0 b/metadata/md5-cache/dev-python/meld3-1.0.0
index 0c7a55076ad6..6452b28ce840 100644
--- a/metadata/md5-cache/dev-python/meld3-1.0.0
+++ b/metadata/md5-cache/dev-python/meld3-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=meld3 is an HTML/XML templating engine
 EAPI=5
 HOMEPAGE=https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZPL
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meld3/meld3-1.0.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3931c6b258ea9c8efa7cca270addff14
+_md5_=0925d518b15a153d0a8961f05a193939
diff --git a/metadata/md5-cache/dev-python/mimerender-0.5.5 b/metadata/md5-cache/dev-python/mimerender-0.5.5
index c5efa339a7be..ccc5be919b81 100644
--- a/metadata/md5-cache/dev-python/mimerender-0.5.5
+++ b/metadata/md5-cache/dev-python/mimerender-0.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webap
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/mimerender
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/m/mimerender/mimerender-0.5.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=de94f205a9e1b153ae1fa38266b31e97
+_md5_=f81a706b792db0806f436b2613b1e5a4
diff --git a/metadata/md5-cache/dev-python/mocker-1.1.1-r1 b/metadata/md5-cache/dev-python/mocker-1.1.1-r1
index b1f7e5aed5ad..e3174435fb8b 100644
--- a/metadata/md5-cache/dev-python/mocker-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/mocker-1.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Platform for Python test doubles: mocks, stubs, fakes, and dummies
 EAPI=5
 HOMEPAGE=http://labix.org/mocker http://pypi.python.org/pypi/mocker
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/m/mocker/mocker-1.1.1.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a94f43580259ed341a55197f6b9a6dca
+_md5_=65b1c08464384154b6d370b02d97fe2d
diff --git a/metadata/md5-cache/dev-python/mockldap-0.2.3 b/metadata/md5-cache/dev-python/mockldap-0.2.3
index f425f0814242..cd48469fecee 100644
--- a/metadata/md5-cache/dev-python/mockldap-0.2.3
+++ b/metadata/md5-cache/dev-python/mockldap-0.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=A simple mock implementation of python-ldap
 EAPI=5
 HOMEPAGE=https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap
 IUSE=doc python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=~dev-python/funcparserlib-0.3.6[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/m/mockldap/mockldap-0.2.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c76aeb2d898c1d008eee75a0370d89ef
+_md5_=3b6b8f47b413eac8ebeac7cf8bd714ac
diff --git a/metadata/md5-cache/dev-python/more-itertools-2.2 b/metadata/md5-cache/dev-python/more-itertools-2.2
index 5fbaead48794..b8fd71bd70c5 100644
--- a/metadata/md5-cache/dev-python/more-itertools-2.2
+++ b/metadata/md5-cache/dev-python/more-itertools-2.2
@@ -4,11 +4,11 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/more-itertools
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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/m/more-itertools/more-itertools-2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e13ca050fdba5496ef54fa0f394fddb4
+_md5_=2a7750c331937381844d0be6bca8fa57
diff --git a/metadata/md5-cache/dev-python/mox3-0.7.0-r1 b/metadata/md5-cache/dev-python/mox3-0.7.0-r1
index 1f9fcea1808a..099ab6c670f3 100644
--- a/metadata/md5-cache/dev-python/mox3-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/mox3-0.7.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Mock object framework for Python
 EAPI=5
 HOMEPAGE=http://www.openstack.org/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-0.5.21[python_targets_python2_7(-)?,python_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/fixtures-0.3.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(-)] 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/m/mox3/mox3-0.7.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b7df6a2a4e1311e499882b058f62f7b7
+_md5_=b58ca9da8b19a7564e6461409b75a749
diff --git a/metadata/md5-cache/dev-python/msgpack-0.4.5 b/metadata/md5-cache/dev-python/msgpack-0.4.5
index 7795569640e7..d9733a4a828d 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.4.5
+++ b/metadata/md5-cache/dev-python/msgpack-0.4.5
@@ -4,11 +4,11 @@ DESCRIPTION=MessagePack (de)serializer for Python
 EAPI=5
 HOMEPAGE=http://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.python.org/pypi/msgpack-python/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm 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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.4.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d4f23cf47aaa235abb901bb0ec3ad91c
+_md5_=7e78b9b91c27ffcd3ce99a1b0f2b6e57
diff --git a/metadata/md5-cache/dev-python/multipledispatch-0.4.7 b/metadata/md5-cache/dev-python/multipledispatch-0.4.7
index 1050d640f0ee..e51a8d8f15d0 100644
--- a/metadata/md5-cache/dev-python/multipledispatch-0.4.7
+++ b/metadata/md5-cache/dev-python/multipledispatch-0.4.7
@@ -4,11 +4,11 @@ DESCRIPTION=RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webap
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/mimerender
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/m/multipledispatch/multipledispatch-0.4.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c54d7696559f0895ac0f25b5726d2089
+_md5_=5569a06a55c2c7faaa03a1f3f8b49ff3
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.7-r1 b/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
index 7551306686e4..9f8d7c4ed2a0 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A gpodder.net client library
 EAPI=5
 HOMEPAGE=http://thp.io/2010/mygpoclient/
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/simplejson python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://thp.io/2010/mygpoclient/mygpoclient-1.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=00975b262b65a6c98208c67bf3dcc7e2
+_md5_=39cd671948bd73e813f7aea8410f8dca
diff --git a/metadata/md5-cache/dev-python/natsort-3.4.0 b/metadata/md5-cache/dev-python/natsort-3.4.0
index 6023894b3d37..8c64e0ff741d 100644
--- a/metadata/md5-cache/dev-python/natsort-3.4.0
+++ b/metadata/md5-cache/dev-python/natsort-3.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Natural sorting for Python
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/natsort
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-3.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bd828a6ac24cdaa2714f6246cee7ac49
+_md5_=00e9ca7f6c6e4c408cf80abcc19c4a70
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.12 b/metadata/md5-cache/dev-python/netaddr-0.7.12
index cc1d1fc81781..8f8fd3250442 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.12
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.12
@@ -4,11 +4,11 @@ DESCRIPTION=Network address representation and manipulation library
 EAPI=5
 HOMEPAGE=https://github.com/drkjam/netaddr http://pypi.python.org/pypi/netaddr
 IUSE=cli python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=cli? ( >=dev-python/ipython-0.13.1-r1[python_targets_python2_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/n/netaddr/netaddr-0.7.12.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=32c2ceff789902b0497de35a7c0d88a3
+_md5_=748635d8f8c2a0bf857184cd8e284f08
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.4 b/metadata/md5-cache/dev-python/netifaces-0.10.4
index 3ac4fe554a2c..b42e48ec0a36 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.10.4
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.4
@@ -4,11 +4,11 @@ DESCRIPTION=Portable network interface information
 EAPI=5
 HOMEPAGE=http://alastairs-place.net/netifaces/ https://pypi.python.org/pypi/netifaces/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 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/n/netifaces/netifaces-0.10.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8c981a39c56d7b85509747720dddcdac
+_md5_=3c2c02da25ed20870c4ef313c116f3f7
diff --git a/metadata/md5-cache/dev-python/networkx-1.9.1 b/metadata/md5-cache/dev-python/networkx-1.9.1
index f0e4af969c6d..7eab5f838944 100644
--- a/metadata/md5-cache/dev-python/networkx-1.9.1
+++ b/metadata/md5-cache/dev-python/networkx-1.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=5
 HOMEPAGE=http://networkx.github.io/ https://github.com/networkx/networkx
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] examples? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_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-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pyparsing[python_targets_python2_7(-)?,python_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[python_targets_python2_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/n/networkx/networkx-1.9.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ad1660c69008f4c6d3f933a6d88fd206
+_md5_=1afa544b960ceff6f1bf6847c34333ee
diff --git a/metadata/md5-cache/dev-python/nose-exclude-0.1.9 b/metadata/md5-cache/dev-python/nose-exclude-0.1.9
index 51cd57833785..e34f84a6e9c4 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.1.9
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.1.9
@@ -4,11 +4,11 @@ DESCRIPTION=Exclude specific directories from nosetests runs
 EAPI=5
 HOMEPAGE=http://bitbucket.org/kgrandis/nose-exclude
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-exclude/nose-exclude-0.1.9.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=57b26617a9b5295c170c8219141b2bad
+_md5_=f19bc9da5dafa90a2fc917859ba63e7a
diff --git a/metadata/md5-cache/dev-python/oauth-1.0.1-r1 b/metadata/md5-cache/dev-python/oauth-1.0.1-r1
index 093632937fe4..72c2c8357035 100644
--- a/metadata/md5-cache/dev-python/oauth-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/oauth-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python OAuth module
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/oauth
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth/oauth-1.0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=78c13b157e8697ea974250e6a4cbb2cd
+_md5_=9dbc4da24d36255ae3764f7240ff1081
diff --git a/metadata/md5-cache/dev-python/oauth2-1.5.211-r1 b/metadata/md5-cache/dev-python/oauth2-1.5.211-r1
index 1c13c4d4f66b..a3ee91249b80 100644
--- a/metadata/md5-cache/dev-python/oauth2-1.5.211-r1
+++ b/metadata/md5-cache/dev-python/oauth2-1.5.211-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for OAuth version 1.0
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/oauth2
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth2/oauth2-1.5.211.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=89632c45e10045c41b60f205c593929b
+_md5_=5b11cec12bbb6ff94bc8145a01074d54
diff --git a/metadata/md5-cache/dev-python/oauth2client-1.4.6 b/metadata/md5-cache/dev-python/oauth2client-1.4.6
index 9356eb06c9be..a3a4c873cac9 100644
--- a/metadata/md5-cache/dev-python/oauth2client-1.4.6
+++ b/metadata/md5-cache/dev-python/oauth2client-1.4.6
@@ -4,7 +4,7 @@ DESCRIPTION=Library for accessing resources protected by OAuth 2.0
 EAPI=5
 HOMEPAGE=https://github.com/google/oauth2client
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/rsa-3.1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] !<=dev-python/google-api-python-client-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] 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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v1.4.6.tar.gz -> oauth2client-1.4.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c6c335a3f3e4894bb95e302f9881b706
+_md5_=7c2029766e8de4c4fb1f0552ca4466dc
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.7.2 b/metadata/md5-cache/dev-python/oauthlib-0.7.2
index 285c1eb609b5..50e5e3c1a9cb 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.7.2
+++ b/metadata/md5-cache/dev-python/oauthlib-0.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=A generic, spec-compliant, thorough implementation of the OAuth requ
 EAPI=5
 HOMEPAGE=https://github.com/idan/oauthlib http://pypi.python.org/pypi/oauthlib
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/blinker[python_targets_python2_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/oauthlib/oauthlib-0.7.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ef714519053571baa19dc5dee789bb8c
+_md5_=ec975d10d83b51c8565f0ab44bf04ecc
diff --git a/metadata/md5-cache/dev-python/oct2py-1.3.0-r1 b/metadata/md5-cache/dev-python/oct2py-1.3.0-r1
index 84968deabc4b..1b9eec1a5674 100644
--- a/metadata/md5-cache/dev-python/oct2py-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/oct2py-1.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python to GNU Octave bridge
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/oct2py
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-mathematics/octave 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/oct2py/oct2py-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=951f9dbe4d2c8702efbdda1930afa253
+_md5_=58bbccc62adcec08378a3da75979690d
diff --git a/metadata/md5-cache/dev-python/oslo-config-1.4.0 b/metadata/md5-cache/dev-python/oslo-config-1.4.0
index df88c81248c9..867248f8c34f 100644
--- a/metadata/md5-cache/dev-python/oslo-config-1.4.0
+++ b/metadata/md5-cache/dev-python/oslo-config-1.4.0
@@ -4,11 +4,11 @@ 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
+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.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/stevedore-0.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(-)] 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.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=604dbc8db9425a42020fcc127357f262
+_md5_=6d562a6f34bd7307cee9fb70a9002d00
diff --git a/metadata/md5-cache/dev-python/oslo-config-1.9.0 b/metadata/md5-cache/dev-python/oslo-config-1.9.0
new file mode 100644
index 000000000000..54fdf9940def
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-config-1.9.0
@@ -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_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 ~amd64-linux ~x86 ~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.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=4cf266cfbbb24b7c6894898bf52fc56a
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-1.4.0 b/metadata/md5-cache/dev-python/oslo-i18n-1.4.0
index d87bf086ce85..73bf10361f34 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-1.4.0
+++ b/metadata/md5-cache/dev-python/oslo-i18n-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=oslo.i18n library
 EAPI=5
 HOMEPAGE=http://launchpad.net/oslo
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+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.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0c3a813d03c1f14fea0106b4ac078716
+_md5_=0fbc918f095b9d28f32d44a0024c65b3
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-1.3.0 b/metadata/md5-cache/dev-python/oslo-serialization-1.3.0
index dd230ae3fc0d..f64db78efda2 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-1.3.0
+++ b/metadata/md5-cache/dev-python/oslo-serialization-1.3.0
@@ -4,7 +4,7 @@ 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
+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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=405b6a34c00839d2b48b377344c7a6f7
+_md5_=d6bb5e1cc30c8066defb41d0abc31765
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
index d5490e6792a0..3cd3db05b2fe 100644
--- a/metadata/md5-cache/dev-python/oslo-sphinx-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/oslo-sphinx-2.2.0-r1
@@ -4,11 +4,11 @@ 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=amd64 ~x86
+KEYWORDS=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	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=99689f0ae757104062829da0d51e30e6
+_md5_=5d3aa1fcf6b3aab633188c15b03d2997
diff --git a/metadata/md5-cache/dev-python/oslo-utils-1.3.0 b/metadata/md5-cache/dev-python/oslo-utils-1.3.0
index 2a79deda7de4..533dd95e3446 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-1.3.0
+++ b/metadata/md5-cache/dev-python/oslo-utils-1.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Oslo Utility library
 EAPI=5
 HOMEPAGE=http://launchpad.net/oslo
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=532dedd72ffc03342823203428d4eb34
+_md5_=3fb58fc30a1b451ba8f9103c6fd253f0
diff --git a/metadata/md5-cache/dev-python/oslotest-1.3.0 b/metadata/md5-cache/dev-python/oslotest-1.3.0
index cc5259cdd0ac..984a4b145f84 100644
--- a/metadata/md5-cache/dev-python/oslotest-1.3.0
+++ b/metadata/md5-cache/dev-python/oslotest-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=OpenStack test framework
 EAPI=5
 HOMEPAGE=http://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
+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	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ceab7cdf1dfe65aed495dca24ea5cdca
+_md5_=89b6eda73d599c8654a36a2d83b3536e
diff --git a/metadata/md5-cache/dev-python/pandas-0.15.2 b/metadata/md5-cache/dev-python/pandas-0.15.2
index 5ad25ccf1b9f..de04d60125c9 100644
--- a/metadata/md5-cache/dev-python/pandas-0.15.2
+++ b/metadata/md5-cache/dev-python/pandas-0.15.2
@@ -4,11 +4,11 @@ DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=5
 HOMEPAGE=http://pandas.sourceforge.net/
 IUSE=doc examples excel html test R python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>dev-python/numpy-1.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/python-dateutil-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/openpyxl-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/numexpr-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/bottleneck[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] excel? ( >=dev-python/openpyxl-1.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/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) html? ( dev-python/beautifulsoup: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/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ) R? ( dev-python/rpy[python_targets_python2_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/pandas/pandas-0.15.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a7ce2abf2ef66602a69797a857ef0cbf
+_md5_=c97cd32c414a222ea84b6e7300ba2d95
diff --git a/metadata/md5-cache/dev-python/paramiko-1.15.1-r1 b/metadata/md5-cache/dev-python/paramiko-1.15.1-r1
index 970c71802092..c44b02399218 100644
--- a/metadata/md5-cache/dev-python/paramiko-1.15.1-r1
+++ b/metadata/md5-cache/dev-python/paramiko-1.15.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
 EAPI=5
 HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ http://pypi.python.org/pypi/paramiko/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/pycrypto-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/pycrypto-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/ecdsa-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(-)] 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/paramiko/paramiko-1.15.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=384e70a27959f39909b826801999f533
+_md5_=cce8f2a80bbf3e36ac376c9d5bddb921
diff --git a/metadata/md5-cache/dev-python/paste-1.7.5.1-r1 b/metadata/md5-cache/dev-python/paste-1.7.5.1-r1
index 3acd83bb13c8..1e165cf02155 100644
--- a/metadata/md5-cache/dev-python/paste-1.7.5.1-r1
+++ b/metadata/md5-cache/dev-python/paste-1.7.5.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for using a Web Server Gateway Interface stack
 EAPI=5
 HOMEPAGE=http://pythonpaste.org http://pypi.python.org/pypi/Paste
 IUSE=doc flup openid python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] flup? ( dev-python/flup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openid? ( dev-python/python-openid[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/Paste/Paste-1.7.5.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=50ba2500c84578e219c1904a3bbcbc23
+_md5_=804e1f93c03113204d45cfe10d06cd3b
diff --git a/metadata/md5-cache/dev-python/pastescript-1.7.5-r2 b/metadata/md5-cache/dev-python/pastescript-1.7.5-r2
index 7de0d668f5d1..b9391270abaf 100644
--- a/metadata/md5-cache/dev-python/pastescript-1.7.5-r2
+++ b/metadata/md5-cache/dev-python/pastescript-1.7.5-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A pluggable command-line frontend, including commands to setup packa
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/script/ http://pypi.python.org/pypi/PasteScript
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paste-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteScript/PasteScript-1.7.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1043acf5049856103e9af37f332da630
+_md5_=67fe8cb8edf135b486105b401b8914b0
diff --git a/metadata/md5-cache/dev-python/patsy-0.3.0 b/metadata/md5-cache/dev-python/patsy-0.3.0
index a91f20a346fa..bfe0b72b6681 100644
--- a/metadata/md5-cache/dev-python/patsy-0.3.0
+++ b/metadata/md5-cache/dev-python/patsy-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python module to describe statistical models and design matrices
 EAPI=5
 HOMEPAGE=http://patsy.readthedocs.org/en/latest/index.html
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_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/patsy/patsy-0.3.0.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e0eb424e74d98986d57b9a3b55053add
+_md5_=6ff74e524abe65f9e4e1b8b391f87443
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.2-r1 b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
index bda63a741459..325ee44d1c5a 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PBR is a library that injects some useful and sensible default behav
 EAPI=5
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pip-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(-)] 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/pbr/pbr-0.8.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=404e96bcf022955092b096a03d7d7656
+_md5_=0158dd5dd7a32553b17fbae4a2e1dce0
diff --git a/metadata/md5-cache/dev-python/pep8-1.5.6 b/metadata/md5-cache/dev-python/pep8-1.5.6
index 14439f45bb11..ff252645ca6b 100644
--- a/metadata/md5-cache/dev-python/pep8-1.5.6
+++ b/metadata/md5-cache/dev-python/pep8-1.5.6
@@ -4,11 +4,11 @@ DESCRIPTION=Python style guide checker
 EAPI=5
 HOMEPAGE=http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 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_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.5.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=923ee9cfb62decaf512cfb8692a66ec0
+_md5_=6a1a9ad4de8c672fb486d7ec4267cd15
diff --git a/metadata/md5-cache/dev-python/peppercorn-0.5 b/metadata/md5-cache/dev-python/peppercorn-0.5
index 981cd0131cd6..5b464ecbf319 100644
--- a/metadata/md5-cache/dev-python/peppercorn-0.5
+++ b/metadata/md5-cache/dev-python/peppercorn-0.5
@@ -4,11 +4,11 @@ DESCRIPTION=A library for converting a token stream into a data structure for us
 EAPI=5
 HOMEPAGE=https://github.com/Pylons/peppercorn http://pypi.python.org/pypi/peppercorn
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/peppercorn/peppercorn-0.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=83593427064b787843771467225abab6
+_md5_=4b4f0f5eb3176f68b89200924fc5eae1
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.0 b/metadata/md5-cache/dev-python/pkginfo-1.0
index 938bf5d0ab9a..1b758f6db66b 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.0
+++ b/metadata/md5-cache/dev-python/pkginfo-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/pkginfo
 IUSE=doc examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1a5966facda780a3bbb89b83f42fc0dc
+_md5_=ff256902d93673c1621d7e3b6b8a61fd
diff --git a/metadata/md5-cache/dev-python/placefinder-0.3 b/metadata/md5-cache/dev-python/placefinder-0.3
index f1fbfc2786a2..76ced65a2c05 100644
--- a/metadata/md5-cache/dev-python/placefinder-0.3
+++ b/metadata/md5-cache/dev-python/placefinder-0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Yahoo! BOSS PlaceFinder Python Client
 EAPI=5
 HOMEPAGE=https://github.com/adampresley/placefinder-py
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/placefinder-py/placefinder-py-0.3.tar.gz -> placefinder-0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3cf7f6e723a9aa7f332f6349996427d8
+_md5_=af1483d3b2b79d35cbeb520cff068292
diff --git a/metadata/md5-cache/dev-python/plyr-1.0.6 b/metadata/md5-cache/dev-python/plyr-1.0.6
index fe86d05ec9c0..dc4f6c3d91af 100644
--- a/metadata/md5-cache/dev-python/plyr-1.0.6
+++ b/metadata/md5-cache/dev-python/plyr-1.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=A python wrapper for Glyr
 EAPI=5
 HOMEPAGE=http://sahib.github.com/python-glyr/intro.html https://github.com/sahib/python-glyr
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/glyr python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/sahib/python-glyr/archive/1.0.6.tar.gz -> python-glyr-1.0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=73b08c007c70fdbf2bd1d228964ebb71
+_md5_=cf08b28c4f7f04b4c56c14d8db6a9f47
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.0-r2 b/metadata/md5-cache/dev-python/pmw-2.0.0-r2
index eefa4e5c093c..d646c691070b 100644
--- a/metadata/md5-cache/dev-python/pmw-2.0.0-r2
+++ b/metadata/md5-cache/dev-python/pmw-2.0.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Toolkit for building high-level compound widgets in Python using the
 EAPI=5
 HOMEPAGE=http://pmw.sourceforge.net/
 IUSE=doc examples test python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=!dev-python/pmw:0 python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[tk] ) python_targets_python3_4? ( dev-lang/python:3.4[tk] ) >=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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://sourceforge/pmw/Pmw.2.0.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=af27b49d384e057d0ea27dc6cd5183d3
+_md5_=74ed147f83d9d7499938538b45548dcc
diff --git a/metadata/md5-cache/dev-python/psycopg-1.1.21-r1 b/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
index 2104ce69630c..764609119e3a 100644
--- a/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
+++ b/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL database adapter for Python
 EAPI=5
 HOMEPAGE=http://www.initd.org/software/psycopg
 IUSE=examples python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/egenix-mx-base-2.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/postgresql 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(-)]
 SLOT=0
 SRC_URI=http://initd.org/pub/software/psycopg/psycopg-1.1.21.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=66ecad62971bafec72b08c3fb81d8c05
+_md5_=0841677c015daa8ad9102a51e0e0b971
diff --git a/metadata/md5-cache/dev-python/pudge-0.1.3-r1 b/metadata/md5-cache/dev-python/pudge-0.1.3-r1
index 0dbe3225aba0..019dfa9f89bd 100644
--- a/metadata/md5-cache/dev-python/pudge-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/pudge-0.1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A documentation generator for Python projects, using Restructured Te
 EAPI=5
 HOMEPAGE=http://pudge.lesscode.org http://pypi.python.org/pypi/pudge
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kid-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[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/pudge/pudge-0.1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3e5f8a6d6fe4bb40db7379dac3277d89
+_md5_=00a987732817b59a0b78876536cc75b3
diff --git a/metadata/md5-cache/dev-python/pupynere-1.0.15-r1 b/metadata/md5-cache/dev-python/pupynere-1.0.15-r1
index dd7e232ec3d4..a92f44db3a02 100644
--- a/metadata/md5-cache/dev-python/pupynere-1.0.15-r1
+++ b/metadata/md5-cache/dev-python/pupynere-1.0.15-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Pupynere is a PUre PYthon NEtcdf REader
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/pupynere/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/numpy[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/pupynere/pupynere-1.0.15.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=777d9e469d2bea90fd76c615bf1381b4
+_md5_=03e66688c85a167874348516dff04352
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.4.6 b/metadata/md5-cache/dev-python/py-amqp-1.4.6
index bb9f9c0bba38..773732059bbf 100644
--- a/metadata/md5-cache/dev-python/py-amqp-1.4.6
+++ b/metadata/md5-cache/dev-python/py-amqp-1.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=Low-level AMQP client for Python (fork of amqplib)
 EAPI=5
 HOMEPAGE=https://github.com/celery/py-amqp http://pypi.python.org/pypi/amqp/
 IUSE=doc examples extras test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-1.4.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=106a381fcb075dee1d1252a78f832c72
+_md5_=205337eb14389e58d7e76d7b2457b5a0
diff --git a/metadata/md5-cache/dev-python/py-bcrypt-0.4 b/metadata/md5-cache/dev-python/py-bcrypt-0.4
index eb105ec9d1f3..4e118f2cd973 100644
--- a/metadata/md5-cache/dev-python/py-bcrypt-0.4
+++ b/metadata/md5-cache/dev-python/py-bcrypt-0.4
@@ -4,11 +4,11 @@ DESCRIPTION=py-bcrypt is an implementation of the OpenBSD Blowfish password hash
 EAPI=5
 HOMEPAGE=https://code.google.com/p/py-bcrypt/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-4
 RDEPEND=!dev-python/bcrypt 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=http://py-bcrypt.googlecode.com/files/py-bcrypt-0.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7772066e76251d30f3e67d6a07dec510
+_md5_=97c5bf30741cff1d6863d24f03a7de1f
diff --git a/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2 b/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2
index f6936059d18f..f4f2a46264ca 100644
--- a/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2
+++ b/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A Python wrapper for the ALSA API
 EAPI=5
 HOMEPAGE=http://www.sourceforge.net/projects/pyalsaaudio http://pypi.python.org/pypi/pyalsaaudio
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ppc ~sparc x86
 LICENSE=PSF-2
 RDEPEND=media-libs/alsa-lib 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pyalsaaudio/pyalsaaudio-0.7.tar.gz mirror://pypi/p/pyalsaaudio/pyalsaaudio-0.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b67bcdc4e111c30f4443b2afb5798741
+_md5_=8f95bda2055c12acf4ecc5675e26037d
diff --git a/metadata/md5-cache/dev-python/pyev-0.8.1 b/metadata/md5-cache/dev-python/pyev-0.8.1
index c667f3a7c1d3..952b0d36bc8b 100644
--- a/metadata/md5-cache/dev-python/pyev-0.8.1
+++ b/metadata/md5-cache/dev-python/pyev-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python libev interface, an event loop
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pyev/ http://pythonhosted.org/pyev/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=dev-libs/libev 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(-)] 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/pyev/pyev-0.8.1-4.04.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=398520676cfc575cb1020382e428d5d4
+_md5_=c86902322a467f2b8d5fd5262cb16e51
diff --git a/metadata/md5-cache/dev-python/pyface-4.4.0 b/metadata/md5-cache/dev-python/pyface-4.4.0
index e6b5bc03c4ba..74fcc123e27c 100644
--- a/metadata/md5-cache/dev-python/pyface-4.4.0
+++ b/metadata/md5-cache/dev-python/pyface-4.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Traits-capable windowing framework
 EAPI=5
 HOMEPAGE=https://github.com/enthought/pyface
 IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4 dev-python/pyside[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/pyface/pyface-4.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3549f7d5ffd568417a34a094fca99642
+_md5_=fd4c360d9854c83fedbfb304bb7637d9
diff --git a/metadata/md5-cache/dev-python/pyfits-3.3 b/metadata/md5-cache/dev-python/pyfits-3.3
index d3f2c7b17304..aacdc599aad2 100644
--- a/metadata/md5-cache/dev-python/pyfits-3.3
+++ b/metadata/md5-cache/dev-python/pyfits-3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Provides an interface to FITS formatted files under python
 EAPI=5
 HOMEPAGE=http://www.stsci.edu/resources/software_hardware/pyfits
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !<dev-python/astropy-0.3 sci-libs/cfitsio: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_python2_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/pyfits/pyfits-3.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c174ae6f09b6ac6e2bc4e675c6c96b37
+_md5_=7b166f13634724e48b3da97817c90bbb
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.3.0 b/metadata/md5-cache/dev-python/pyftpdlib-1.3.0
index d45bda2d6f5b..6310b7da97e8 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.3.0
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python FTP server library
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pyftpdlib/ http://pypi.python.org/pypi/pyftpdlib
 IUSE=examples ssl python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ssl(+)] ) python_targets_pypy? ( virtual/pypy:0=[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=http://pyftpdlib.googlecode.com/files/pyftpdlib-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2f9dd57c0bac5eb11fe60f1cec1e733a
+_md5_=173167a17d5cd2b9f670a9354dfa6a96
diff --git a/metadata/md5-cache/dev-python/pygal-1.5.1 b/metadata/md5-cache/dev-python/pygal-1.5.1
index da9a1797ab80..07799e67ffbd 100644
--- a/metadata/md5-cache/dev-python/pygal-1.5.1
+++ b/metadata/md5-cache/dev-python/pygal-1.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=A python SVG charts generator
 EAPI=5
 HOMEPAGE=http://pygal.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/lxml 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/pygal/pygal-1.5.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d6a7cfffdfeb94c7b6007c4f7372f35e
+_md5_=c443fd98bfa7813cf0879ea59e8e70d3
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r1 b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
index a9029787b245..1b4b2e426bfe 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r1
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python wrapper for the GPGME library
 EAPI=5
 HOMEPAGE=https://launchpad.net/pygpgme
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gpgme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=60750b01fe94d256b4114fd1a40196f2
+_md5_=6a048bdf45fcc25855a0c3a37eeeb2ab
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.2 b/metadata/md5-cache/dev-python/pygraphviz-1.2
index 3b325a5be3e6..f6d5666411e6 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.2
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper for the Graphviz Agraph data structure
 EAPI=5
 HOMEPAGE=http://networkx.lanl.gov/pygraphviz/ http://pypi.python.org/pypi/pygraphviz
 IUSE=examples python_targets_python2_7
-KEYWORDS=amd64 ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=media-gfx/graphviz 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/pygraphviz/pygraphviz-1.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c878a4919d2abf9542676c03f94dffaf
+_md5_=1b35952768dc28d87bc922b6d77b6b84
diff --git a/metadata/md5-cache/dev-python/pyjwt-0.2.1 b/metadata/md5-cache/dev-python/pyjwt-0.2.1
index 0820e411808f..dddadf8f27e1 100644
--- a/metadata/md5-cache/dev-python/pyjwt-0.2.1
+++ b/metadata/md5-cache/dev-python/pyjwt-0.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=JSON Web Token implementation in Python
 EAPI=5
 HOMEPAGE=http://github.com/progrium/pyjwt https://pypi.python.org/pypi/PyJWT/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-0.2.1.tar.gz -> pyjwt-0.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ba9ce69a1aca9b289b8308d08623e80d
+_md5_=3546b9b3a0a73272ddfa7aa38acceba7
diff --git a/metadata/md5-cache/dev-python/pylint-1.4.1 b/metadata/md5-cache/dev-python/pylint-1.4.1
index 63def778cfdc..0524cbce5dd5 100644
--- a/metadata/md5-cache/dev-python/pylint-1.4.1
+++ b/metadata/md5-cache/dev-python/pylint-1.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python code static checker
 EAPI=5
 HOMEPAGE=http://www.logilab.org/project/pylint http://pypi.python.org/pypi/pylint
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-python/logilab-common-0.53.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/astroid-1.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-1.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6c79bbed396cf8dfb45faf5c7064ee75
+_md5_=f09a13e5a4cef5291b02c94e91aaa9c5
diff --git a/metadata/md5-cache/dev-python/pynut-1.2 b/metadata/md5-cache/dev-python/pynut-1.2
index c0fba2c39c1c..a78ee83b7974 100644
--- a/metadata/md5-cache/dev-python/pynut-1.2
+++ b/metadata/md5-cache/dev-python/pynut-1.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=An abstraction class written in Python to access NUT (Network UPS Tools) server
 EAPI=3
 HOMEPAGE=http://www.lestat.st/informatique/projets/pynut-en/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.lestat.st/_media/informatique/projets/pynut/python-pynut-1.2.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4af23b6affc92e21fdc839fe4ca6dee8
+_md5_=4d045c5f4739e74a7e5c7757962649b8
diff --git a/metadata/md5-cache/dev-python/pynzb-0.1.0-r1 b/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
index ae9b8e0a7fe5..d023e7538a3c 100644
--- a/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Unified API for parsing NZB files
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/pynzb/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pynzb/pynzb-0.1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=32b46764d1acd7c01e1a63d7d1b8b8b7
+_md5_=b1a7dc0828cd9f99505b34974b91b4f3
diff --git a/metadata/md5-cache/dev-python/pyopencl-2014.1 b/metadata/md5-cache/dev-python/pyopencl-2014.1
index a85bbaea4008..3e04249bef1c 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2014.1
+++ b/metadata/md5-cache/dev-python/pyopencl-2014.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper for OpenCL
 EAPI=5
 HOMEPAGE=http://mathema.tician.de/software/pyopencl http://pypi.python.org/pypi/pyopencl
 IUSE=examples opengl python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytools[python_targets_python2_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/opencl-0-r1 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/pyopencl/pyopencl-2014.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fdea19a9e391180e717d67ddf2b399f1
+_md5_=946ad89133060682863dbc509f6c153b
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.0 b/metadata/md5-cache/dev-python/pypax-0.9.0
index 103ff1c0465d..5dd5bd37dbab 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.0
+++ b/metadata/md5-cache/dev-python/pypax-0.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python module to get or set either PT_PAX and/or XATTR_PAX flags
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~blueness/elfix/ http://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
 IUSE=+ptpax +xtpax python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/elfix/elfix-0.9.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7447d940a14c46169a74fadf124feadc
+_md5_=06b62ac3a4b5b02f3bd089c0679f751a
diff --git a/metadata/md5-cache/dev-python/pyphen-0.9.1 b/metadata/md5-cache/dev-python/pyphen-0.9.1
index 316e9ac3bed5..d20790b90189 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.9.1
+++ b/metadata/md5-cache/dev-python/pyphen-0.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for hyphenation using hunspell dictionaries
 EAPI=5
 HOMEPAGE=https://github.com/Kozea/Pyphen
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ MPL-1.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=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/Pyphen/Pyphen-0.9.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c747d4cb52487ce1f14ba3f563112628
+_md5_=48d0882491ed0635112433ae47f7fcbe
diff --git a/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1 b/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
index 9d3a799c2d73..709a4218b2c0 100644
--- a/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
+++ b/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Extends the PEP 246 adapt function with a new 'declaration API'
 EAPI=5
 HOMEPAGE=http://peak.telecommunity.com/PyProtocols.html http://pypi.python.org/pypi/PyProtocols http://svn.eby-sarna.com/PyProtocols/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=|| ( PSF-2 ZPL )
 RDEPEND=>=dev-python/decoratortools-1.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=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/PyProtocols-1.0a0dev_r2306.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7a07d0f725a4b0f3a523558b74f03e57
+_md5_=a46d97b46889ce79da4006f251fa6540
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.9 b/metadata/md5-cache/dev-python/pyquery-1.2.9
index 3d3d2fe06496..b2a8ae5bc05b 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.9
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=A jQuery-like library for python
 EAPI=5
 HOMEPAGE=https://github.com/gawel/pyquery
 IUSE=beautifulsoup3 test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[beautifulsoup3?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.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/webob-1.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(-)] 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? ( beautifulsoup3 ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.9.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=dede35e29033771fa405bdb34173540a
+_md5_=2772e4e5731aa9143ba1b4b43a65f4a8
diff --git a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1 b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
index 26f76015cde2..2207a014fbcc 100644
--- a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
+++ b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for the Qwt library
 EAPI=5
 HOMEPAGE=http://pyqwt.sourceforge.net/
 IUSE=debug doc examples svg python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ia64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/qwt:5[svg?] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=5
 SRC_URI=mirror://sourceforge/pyqwt/PyQwt-5.2.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=baec82fb01cffc0b4bb86a62a87ac4d2
+_md5_=a742ee724e18133fc4b68d6bd8e8a034
diff --git a/metadata/md5-cache/dev-python/pyramid-1.5.1 b/metadata/md5-cache/dev-python/pyramid-1.5.1
index c9fb6a00c569..af7be1ba844d 100644
--- a/metadata/md5-cache/dev-python/pyramid-1.5.1
+++ b/metadata/md5-cache/dev-python/pyramid-1.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=A small open source Python web framework
 EAPI=5
 HOMEPAGE=http://www.pylonsproject.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze
 RDEPEND=dev-python/chameleon[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/mako[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/repoze-lru[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/translationstring[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/venusian[python_targets_python2_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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyramid/pyramid-1.5.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=12b2702e3df85e299b5e129d12ac56e9
+_md5_=e1641f64317243dbf35b0d60dea288e3
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.2 b/metadata/md5-cache/dev-python/python-dateutil-2.2
index 6e125265c39e..08e8842cbc5e 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.2
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Extensions to the standard Python datetime module
 EAPI=5
 HOMEPAGE=http://labix.org/python-dateutil https://pypi.python.org/pypi/python-dateutil
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] sys-libs/timezone-data !<dev-python/python-dateutil-2.1 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0f08966d2bbb1d67d8d68329a3bfb8db
+_md5_=99ea52610bbe3f21c3af52a9fcc84ec9
diff --git a/metadata/md5-cache/dev-python/python-digest-1.7-r1 b/metadata/md5-cache/dev-python/python-digest-1.7-r1
index 8c2a401e6107..e08c55a6c157 100644
--- a/metadata/md5-cache/dev-python/python-digest-1.7-r1
+++ b/metadata/md5-cache/dev-python/python-digest-1.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python library to aid in implementing HTTP Digest Authentication
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/python-digest/ https://bitbucket.org/akoha/python-digest/
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-digest/python-digest-1.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2a9edab7ed3f464b0d03df65b46e32c5
+_md5_=192928c0db28deb39598d5655b14bc77
diff --git a/metadata/md5-cache/dev-python/python-gflags-2.0 b/metadata/md5-cache/dev-python/python-gflags-2.0
index cb7c73bacea4..b856e1e4e8e3 100644
--- a/metadata/md5-cache/dev-python/python-gflags-2.0
+++ b/metadata/md5-cache/dev-python/python-gflags-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Google's Python argument parsing library
 EAPI=5
 HOMEPAGE=http://code.google.com/p/python-gflags/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://python-gflags.googlecode.com/files/python-gflags-2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=cd08430090b0b9744eef78764bf342d5
+_md5_=4fc0979ca9408622c51a52dc54e3c126
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-1.0.0 b/metadata/md5-cache/dev-python/python-keystoneclient-1.0.0
index b20d6c22bb42..a52017a012e9 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-1.0.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Client Library for OpenStack Identity
 EAPI=5
 HOMEPAGE=https://github.com/openstack/python-keystoneclient
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/pbr-0.7[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(-)] >=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/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-config-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-i18n-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-serialization-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-utils-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/requests-2.4.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(-)] >=dev-python/stevedore-1.1.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/p/python-keystoneclient/python-keystoneclient-1.0.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7aee572ef3f25b7894dcdc0cd689762c
+_md5_=e9ca1626c91ca4b8e0eeca47674d7ff8
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.11.2 b/metadata/md5-cache/dev-python/python-levenshtein-0.11.2
index 7e1650f4e999..8b6b2a8c0598 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.11.2
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.11.2
@@ -4,11 +4,11 @@ DESCRIPTION=Functions for fast computation of Levenshtein (edit) distance, and e
 EAPI=5
 HOMEPAGE=http://github.com/miohtama/python-Levenshtein/tree/ http://pypi.python.org/pypi/python-Levenshtein/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.11.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7605008c3dfea35b000ecd1f124780cf
+_md5_=623b5d3e250b653d2eafc54f07b332da
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1 b/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1
index 31472aaad6f2..f23568031c94 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-0.7.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Bindings for the MusicBrainz XML Web Service
 EAPI=5
 HOMEPAGE=http://musicbrainz.org
 IUSE=doc examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~hppa ppc ppc64 ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=media-libs/libdiscid python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/python-musicbrainz2-0.7.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2eb419e6ed6ebd63b10e3f89dfb687a4
+_md5_=351d6aaa1b84bc5da8eba4518d39a796
diff --git a/metadata/md5-cache/dev-python/python-openid-2.2.5-r1 b/metadata/md5-cache/dev-python/python-openid-2.2.5-r1
index 1f2de2e84767..805b7f07fef8 100644
--- a/metadata/md5-cache/dev-python/python-openid-2.2.5-r1
+++ b/metadata/md5-cache/dev-python/python-openid-2.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenID support for servers and consumers
 EAPI=5
 HOMEPAGE=http://www.openidenabled.com/openid/libraries/python/ http://pypi.python.org/pypi/python-openid
 IUSE=examples mysql postgres sqlite test python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=mysql? ( >=dev-python/mysql-python-1.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=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://gentoo/python-openid-2.2.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4c317a49339f419e224f4bc0c3eb617a
+_md5_=b26f88a15ef05f6d705e236d7104fa03
diff --git a/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1 b/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1
index f190458b1d22..dab407fffb55 100644
--- a/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/python-ptrace-0.8.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=python-ptrace is a debugger using ptrace (Linux, BSD and Darwin syst
 EAPI=5
 HOMEPAGE=http://bitbucket.org/haypo/python-ptrace/ http://pypi.python.org/pypi/python-ptrace
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ptrace/python-ptrace-0.8.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=92f6860c0e93a8da091402e76adadd37
+_md5_=3b32006ae044aa3bb70a21e0d1683bc8
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.1.13 b/metadata/md5-cache/dev-python/python-sqlparse-0.1.13
index aaae26348610..3c83de150813 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.1.13
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.1.13
@@ -4,11 +4,11 @@ DESCRIPTION=A non-validating SQL parser module for Python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 arm hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/andialbrecht/sqlparse/archive/0.1.13.tar.gz -> python-sqlparse-0.1.13.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=eb8cff0806aeebeac93e0fc6eab855d1
+_md5_=bfd6725cf723e66076ae24cde37238a2
diff --git a/metadata/md5-cache/dev-python/python-termstyle-0.1.10 b/metadata/md5-cache/dev-python/python-termstyle-0.1.10
index 1f6badc62ba1..4e592557bbe0 100644
--- a/metadata/md5-cache/dev-python/python-termstyle-0.1.10
+++ b/metadata/md5-cache/dev-python/python-termstyle-0.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=console colouring for python
 EAPI=5
 HOMEPAGE=http://gfxmonk.net/dist/0install/python-termstyle.xml
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/gfxmonk/termstyle/archive/0.1.10.tar.gz -> python-termstyle-0.1.10.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=4d609d921df9626e3427f90dd1a1e458
+_md5_=ee65211430a99149e31287033f4f8f00
diff --git a/metadata/md5-cache/dev-python/pytools-2014.3.5 b/metadata/md5-cache/dev-python/pytools-2014.3.5
index e29c8413dc31..58c0403368ba 100644
--- a/metadata/md5-cache/dev-python/pytools-2014.3.5
+++ b/metadata/md5-cache/dev-python/pytools-2014.3.5
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tools missing from the Python standard library
 EAPI=5
 HOMEPAGE=http://mathema.tician.de/software/pytools
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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/p/pytools/pytools-2014.3.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a5c9b8f8b1d4529fa89177f1c71c597c
+_md5_=c814633148ea43f5e8427e64d05ea098
diff --git a/metadata/md5-cache/dev-python/pyx-0.13 b/metadata/md5-cache/dev-python/pyx-0.13
index 003c7a42424b..0c5e27fc3d94 100644
--- a/metadata/md5-cache/dev-python/pyx-0.13
+++ b/metadata/md5-cache/dev-python/pyx-0.13
@@ -4,11 +4,11 @@ DESCRIPTION=Python package for the generation of encapsulated PostScript figures
 EAPI=5
 HOMEPAGE=http://pyx.sourceforge.net/
 IUSE=doc python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/tex-base dev-texlive/texlive-basic 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://sourceforge/pyx/PyX-0.13.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a84743677c04ff07dd0a21dc5b4df22a
+_md5_=46a89ef7d0d6c11cfbfc728f68ef83c6
diff --git a/metadata/md5-cache/dev-python/pyzmq-14.4.1 b/metadata/md5-cache/dev-python/pyzmq-14.4.1
index 30e31623493a..fe414a86f41c 100644
--- a/metadata/md5-cache/dev-python/pyzmq-14.4.1
+++ b/metadata/md5-cache/dev-python/pyzmq-14.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=PyZMQ is a lightweight and super-fast messaging library built on top
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq
 IUSE=doc examples green test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-2.1.9 dev-python/py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/cffi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] green? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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? ( green ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-14.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0dfbb1675ddf42acbc56dbcee2f956b7
+_md5_=7ad5ad246e31ce1bcd9e119973d317f3
diff --git a/metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1 b/metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1
index 2a3fea357796..5a0e1d03736c 100644
--- a/metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PyZMQ is a lightweight and super-fast messaging library built on top
 EAPI=5
 HOMEPAGE=http://www.zeromq.org/bindings:python http://pypi.python.org/pypi/pyzmq
 IUSE=examples test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-2.1.9 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/p/pyzmq/pyzmq-2.2.0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3a867bfc22271e3bb583b1bd3144359e
+_md5_=7a42667e7f2001bb1de8cd0ea0a937ac
diff --git a/metadata/md5-cache/dev-python/queuelib-1.1.1 b/metadata/md5-cache/dev-python/queuelib-1.1.1
index e54f4edde064..725a91b7f1e9 100644
--- a/metadata/md5-cache/dev-python/queuelib-1.1.1
+++ b/metadata/md5-cache/dev-python/queuelib-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of persistent (disk-based) queues
 EAPI=5
 HOMEPAGE=https://github.com/scrapy/queuelib
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/scrapy/queuelib/archive/v1.1.1.tar.gz -> queuelib.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=4c015b20edc32c831fa31830026e0752
+_md5_=addc3350e52d66fbbc827c80c3771128
diff --git a/metadata/md5-cache/dev-python/rdflib-4.1.2 b/metadata/md5-cache/dev-python/rdflib-4.1.2
index f4a691f0c171..1a87156dec63 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.1.2
+++ b/metadata/md5-cache/dev-python/rdflib-4.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=5
 HOMEPAGE=https://github.com/RDFLib/rdflib http://pypi.python.org/pypi/rdflib
 IUSE=berkdb examples mysql redland sqlite test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) >=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/r/rdflib/rdflib-4.1.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=af4601555c78382adbff074622060eb6
+_md5_=9cad5ed9cfa019b9b828dff16e7e1ade
diff --git a/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1 b/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1
index 846bf9e2b334..639007492a24 100644
--- a/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1
+++ b/metadata/md5-cache/dev-python/recaptcha-client-1.0.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A plugin for reCAPTCHA and reCAPTCHA Mailhide
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/recaptcha-client/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pycrypto[python_targets_python2_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/r/recaptcha-client/recaptcha-client-1.0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8a581d238da271017e38fe49b4db7abc
+_md5_=26c73ab1c075f6de75b4d6ddc512eec6
diff --git a/metadata/md5-cache/dev-python/rednose-0.4.1 b/metadata/md5-cache/dev-python/rednose-0.4.1
index f54383473fc4..4f1829960c1f 100644
--- a/metadata/md5-cache/dev-python/rednose-0.4.1
+++ b/metadata/md5-cache/dev-python/rednose-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=coloured output for nosetests
 EAPI=5
 HOMEPAGE=http://gfxmonk.net/dist/0install/rednose.xml
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/python-termstyle-0.1.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/r/rednose/rednose-0.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0d706c54e033efd0691dd210e6fddc31
+_md5_=fc4f71bb89655d9a2eb87693ec108453
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.6-r1 b/metadata/md5-cache/dev-python/repoze-lru-0.6-r1
index 78c36366406f..5479d0076cd6 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.6-r1
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A tiny LRU cache implementation and decorator
 EAPI=5
 HOMEPAGE=http://www.repoze.org
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=90c9fcf46d2e028e45231ad62f59748f
+_md5_=78141d989c3969a4cdb217982c3d9cc0
diff --git a/metadata/md5-cache/dev-python/requests-mock-0.5.1 b/metadata/md5-cache/dev-python/requests-mock-0.5.1
index cac752743c33..d960d57e6792 100644
--- a/metadata/md5-cache/dev-python/requests-mock-0.5.1
+++ b/metadata/md5-cache/dev-python/requests-mock-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Mock out responses from the requests package
 EAPI=5
 HOMEPAGE=https://github.com/jamielennox/requests-mock
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_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[python_targets_python2_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/r/requests-mock/requests-mock-0.5.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1809296235dd6cd8b5329d73c9ba604c
+_md5_=3c54c86b2fc517e20f6e97ad94a5389a
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-0.4.1 b/metadata/md5-cache/dev-python/requests-oauthlib-0.4.1
index 3a62dc9e938c..e32a1e1b3124 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-0.4.1
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=This project provides first-class OAuth library support for Requests
 EAPI=5
 HOMEPAGE=https://github.com/requests/requests-oauthlib
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=>=dev-python/requests-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/oauthlib-0.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v0.4.1.tar.gz -> requests-oauthlib-0.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=185c56e4f677985e24a80f7ca3ecde81
+_md5_=67cfe7085f743db12fd7f5d47abffb1c
diff --git a/metadata/md5-cache/dev-python/restkit-4.2.2 b/metadata/md5-cache/dev-python/restkit-4.2.2
index e5ca90a1e6b9..a348ca73b4c2 100644
--- a/metadata/md5-cache/dev-python/restkit-4.2.2
+++ b/metadata/md5-cache/dev-python/restkit-4.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A HTTP ressource kit for Python
 EAPI=5
 HOMEPAGE=http://github.com/benoitc/restkit
 IUSE=+cli doc examples test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=cli? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/webob[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] >=dev-python/socketpool-0.5.3[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] >=dev-python/http-parser-0.8.3[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/r/restkit/restkit-4.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a37caf3a9e655f02859f01a5072acf66
+_md5_=9387eee00d482be91c452ff49f04d700
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.0.0 b/metadata/md5-cache/dev-python/retry-decorator-1.0.0
index d5d22e05734e..b32a363b2c90 100644
--- a/metadata/md5-cache/dev-python/retry-decorator-1.0.0
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Decorator for retrying when exceptions occur
 EAPI=5
 HOMEPAGE=https://github.com/pnpnpn/retry-decorator
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/pnpnpn/retry-decorator/archive/v1.0.0.tar.gz -> retry-decorator-1.0.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=f5fcb87def0ead10b5408b53a0b4deb5
+_md5_=e63378eb666045beed4967e1d5f002ea
diff --git a/metadata/md5-cache/dev-python/roman-2.0.0 b/metadata/md5-cache/dev-python/roman-2.0.0
index 002a97a698ba..b1f30da5585b 100644
--- a/metadata/md5-cache/dev-python/roman-2.0.0
+++ b/metadata/md5-cache/dev-python/roman-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=An Integer to Roman numerals converter
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/roman/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PSF-2
 RDEPEND=!<dev-python/docutils-0.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-2.0.0.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=51a1b8af4292cfad331366fa4057ecce
+_md5_=a8165b1fa91cb979106f4f66ac8c3d82
diff --git a/metadata/md5-cache/dev-python/routes-2.0 b/metadata/md5-cache/dev-python/routes-2.0
index 24114895529d..a373de16f685 100644
--- a/metadata/md5-cache/dev-python/routes-2.0
+++ b/metadata/md5-cache/dev-python/routes-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Python re-implementation of the Rails routes system for mapping UR
 EAPI=5
 HOMEPAGE=http://routes.groovie.org http://pypi.python.org/pypi/Routes
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/repoze-lru-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(-)] 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/R/Routes/Routes-2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ba833a3882cf284e8575317c8624b238
+_md5_=207cfd599e8c98816aabd48e31a29933
diff --git a/metadata/md5-cache/dev-python/rpy-2.5.4 b/metadata/md5-cache/dev-python/rpy-2.5.4
index 975ad0f2d9cc..82aa16c70c39 100644
--- a/metadata/md5-cache/dev-python/rpy-2.5.4
+++ b/metadata/md5-cache/dev-python/rpy-2.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to the R Programming Language
 EAPI=5
 HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-lang/R-3 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pandas-0.13.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/ipython[python_targets_python2_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[sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=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/r/rpy2/rpy2-2.5.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ccab51ac87c045595435b0abfc9f8cc5
+_md5_=bc70f5945f7a0aeec6e98f2d6678dbd9
diff --git a/metadata/md5-cache/dev-python/rpyc-3.2.3-r1 b/metadata/md5-cache/dev-python/rpyc-3.2.3-r1
index a988fef1bc9a..1492af47d1fb 100644
--- a/metadata/md5-cache/dev-python/rpyc-3.2.3-r1
+++ b/metadata/md5-cache/dev-python/rpyc-3.2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Remote Python Call (RPyC), a transparent and symmetric RPC library
 EAPI=5
 HOMEPAGE=http://rpyc.sourceforge.net/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 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://sourceforge/rpyc/rpyc-3.2.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c88bdea96ad6d81ae8577b100e3adda1
+_md5_=820e8facdf84dd97b2b0e2f846ee5f83
diff --git a/metadata/md5-cache/dev-python/scimath-4.1.2-r1 b/metadata/md5-cache/dev-python/scimath-4.1.2-r1
index 68f1bd012b79..5b8f42b39c50 100644
--- a/metadata/md5-cache/dev-python/scimath-4.1.2-r1
+++ b/metadata/md5-cache/dev-python/scimath-4.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Scientific and mathematical tools
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/sci_math/ http://pypi.python.org/pypi/scimath
 IUSE=doc test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[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=http://www.enthought.com/repo/ets/scimath-4.1.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=94010f7c52b5a71bbd2b7b93938fc339
+_md5_=5b0c6269d8072df504860061d56d2f9e
diff --git a/metadata/md5-cache/dev-python/scripttest-1.2-r1 b/metadata/md5-cache/dev-python/scripttest-1.2-r1
index 92a5ada12142..42c50bccc831 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.2-r1
+++ b/metadata/md5-cache/dev-python/scripttest-1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A very small text templating language
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/scripttest/ http://pypi.python.org/pypi/ScriptTest
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/ScriptTest/ScriptTest-1.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=923e5349187619777bacb70dde6dea13
+_md5_=fe8733ad6b082d577699262de77a3023
diff --git a/metadata/md5-cache/dev-python/selenium-2.42.1 b/metadata/md5-cache/dev-python/selenium-2.42.1
index 57111d12d2e7..e06f57f6f2a5 100644
--- a/metadata/md5-cache/dev-python/selenium-2.42.1
+++ b/metadata/md5-cache/dev-python/selenium-2.42.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python language binding for Selenium Remote Control (version 1.0 and
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/selenium/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm 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/s/selenium/selenium-2.42.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=35846391cd8398ee1298ec076fcf14d9
+_md5_=205a54e88c5329bf336a7b201ae08fa9
diff --git a/metadata/md5-cache/dev-python/setuptools-12.0.1 b/metadata/md5-cache/dev-python/setuptools-12.0.1
index b6e6562bc244..7b7b62e95b4c 100644
--- a/metadata/md5-cache/dev-python/setuptools-12.0.1
+++ b/metadata/md5-cache/dev-python/setuptools-12.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=a collection of extensions to Distutils
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/setuptools
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=PSF-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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-12.0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4515a7538367fd056ae9be7d18584bed
+_md5_=9fd186d2d4fb710b447d6b24edab06b5
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.0 b/metadata/md5-cache/dev-python/setuptools-git-1.0
index d4a1e77392c5..120cf31ca7c4 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.0
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Setuptools revision control system plugin for Git
 EAPI=5
 HOMEPAGE=https://github.com/wichert/setuptools-git
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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 ) >=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/setuptools-git/setuptools-git-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1be9dd4d94a961dd623384438490407a
+_md5_=581caf67fcc79a620c8749a245cb230a
diff --git a/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1 b/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
index b461e1db779a..53b3718aed76 100644
--- a/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
+++ b/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Setuptools/distribute plugin for finding files under Mercurial versi
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/setuptools_hg http://bitbucket.org/jezdez/setuptools_hg/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_hg/setuptools_hg-0.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8d1d3cc394c541c14fc20c0ff0c2ecde
+_md5_=78c888a04d52f1b208c3dfc307e7accb
diff --git a/metadata/md5-cache/dev-python/singledispatch-3.4.0.3 b/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
index c9411b271cbe..65c1a86b88b1 100644
--- a/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
+++ b/metadata/md5-cache/dev-python/singledispatch-3.4.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A library to bring functools.singledispatch from Python 3.4 to Pytho
 EAPI=5
 HOMEPAGE=http://docs.python.org/3/library/functools.html#functools.singledispatch
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/singledispatch/singledispatch-3.4.0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f9f04ebd5ae0a25e1726ed0781452e23
+_md5_=e5cb093476c07bb0f8c2e777ad2bbefb
diff --git a/metadata/md5-cache/dev-python/smmap-0.9.0 b/metadata/md5-cache/dev-python/smmap-0.9.0
index 8924d25f15c6..74fc07c0f03c 100644
--- a/metadata/md5-cache/dev-python/smmap-0.9.0
+++ b/metadata/md5-cache/dev-python/smmap-0.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=A pure git implementation of a sliding window memory map manager
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/smmap https://github.com/Byron/smmap
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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 ) >=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/smmap/smmap-0.9.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0ddc3fd014c2d6aa2d38e319bf75d7d6
+_md5_=8fee8bb7d8927d484d06414ebf3bd049
diff --git a/metadata/md5-cache/dev-python/snappy-0.5-r2 b/metadata/md5-cache/dev-python/snappy-0.5-r2
index dbffd44aa120..450ce26e9014 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5-r2
+++ b/metadata/md5-cache/dev-python/snappy-0.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for the snappy compression library from Google
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/python-snappy
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=>=app-arch/snappy-1.0.2 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-snappy/python-snappy-0.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e680f44858d3df61d38162c29df2e570
+_md5_=2389ae6d319bd5033fad64da0fb3b6a8
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3 b/metadata/md5-cache/dev-python/socketpool-0.5.3
index 8e2dacb9d514..14cb4e08f319 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=A simple Python socket pool
 EAPI=5
 HOMEPAGE=http://github.com/benoitc/socketpool/
 IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( MIT public-domain )
 RDEPEND=python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ab79c2f970fdd4d6e356fd381c37892f
+_md5_=dddcd7e97d3a84a803d413c7a97fb65b
diff --git a/metadata/md5-cache/dev-python/socksipy-1.02 b/metadata/md5-cache/dev-python/socksipy-1.02
index afc735d9e890..5b1173b1108f 100644
--- a/metadata/md5-cache/dev-python/socksipy-1.02
+++ b/metadata/md5-cache/dev-python/socksipy-1.02
@@ -4,11 +4,11 @@ DESCRIPTION=SOCKS proxy implementation for python
 EAPI=5
 HOMEPAGE=http://socksipy.sourceforge.net/ http://code.google.com/p/socksipy-branch/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+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 ) >=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(-)] 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=http://socksipy-branch.googlecode.com/files/SocksiPy-branch-1.02.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=57b8b40126692e2d806e1d9e5164b540
+_md5_=1fd51f6e9b7fc6ecc4a14ef9a86189f8
diff --git a/metadata/md5-cache/dev-python/south-1.0 b/metadata/md5-cache/dev-python/south-1.0
index ae2f1d4540f8..aded9e1379f8 100644
--- a/metadata/md5-cache/dev-python/south-1.0
+++ b/metadata/md5-cache/dev-python/south-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Intelligent schema migrations for Django apps
 EAPI=5
 HOMEPAGE=http://south.aeracode.org/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/django-1.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/S/South/South-1.0.tar.gz -> south-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=347eeeafb92a5655da3492117d7ad769
+_md5_=4ac3b9cc4c7058bc17e3c74be7dec319
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.6.4 b/metadata/md5-cache/dev-python/sparql-wrapper-1.6.4
index 508dad36b357..b9a788170ef8 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.6.4
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=Wrapper around a SPARQL service
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/SPARQLWrapper
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=W3C
 RDEPEND=>=dev-python/rdflib-2.4.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/S/SPARQLWrapper/SPARQLWrapper-1.6.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=48c2d5fd8990ef0bb5eec2f29062d883
+_md5_=0b2c2fe9949ddb2210690ecada3b7c42
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.6 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.6
index 16d919ca729d..2438769733e1 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.6
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=ReadTheDocs.org theme for Sphinx
 EAPI=5
 HOMEPAGE=https://github.com/snide/sphinx_rtd_theme/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d91e9f836b99ebd30613d6196a2f509d
+_md5_=2c8b2ecb0352410976bdb717aafd0515
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1
index 1dad710b6967..9ff9185a29b2 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-googleanalytics-0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx extension googleanalytics
 EAPI=5
 HOMEPAGE=http://bitbucket.org/birkenfeld/sphinx-contrib
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=>=dev-python/sphinx-0.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/s/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f886bc4aafb11a3e0613bfffb1e4146e
+_md5_=71b61b652d6b34c3c3d452b689db1061
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0
index 0e30a05f97d8..5375e63138d9 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Extension providing a Sphinx domain for describing RESTful HTTP APIs
 EAPI=5
 HOMEPAGE=http://bitbucket.org/birkenfeld/sphinx-contrib/ http://packages.python.org/sphinxcontrib-httpdomain/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=>=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=156b07a6ce260bcc4cb131cbfad1736b
+_md5_=c43b0f272fbf4f3d9b620c686a303f64
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
index 14ed9cfc4e14..597f5358b178 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Extension to sphinx to include program output
 EAPI=5
 HOMEPAGE=http://sphinxcontrib-programoutput.readthedocs.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/sphinx-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=49e4a355287ee46875e2e9125df0c4c1
+_md5_=526e05a84f3841734ac92876c4911c87
diff --git a/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0 b/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0
index 42c5d15ffed9..ed7739c9df7c 100644
--- a/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0
+++ b/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A python script for preparing the html output of Sphinx documentatio
 EAPI=5
 HOMEPAGE=http://github.com/michaeljones/sphinx-to-github/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD-2
 RDEPEND=>=dev-python/sphinx-1.1[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxtogithub/sphinxtogithub-1.1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0b4ce6603abe5571dddcd4fefa4db338
+_md5_=e34b14834ebf851d535e6770c98bc55b
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2
index 0afb1193ffc0..420aca2dbb1f 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=SQLAlchemy Schema Migration Tools
 EAPI=5
 HOMEPAGE=http://code.google.com/p/sqlalchemy-migrate/ http://pypi.python.org/pypi/sqlalchemy-migrate
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=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(-)] >=dev-python/sqlalchemy-0.7.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempita-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-sqlparse[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/s/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4a023897edaf1ef5a1e3cc4e302d4afc
+_md5_=95fa3f965e86abb099df820f1ced2ce7
diff --git a/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1 b/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
index 50c2a385ee22..98bf05ef8257 100644
--- a/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=sqlite cacher for python applications
 EAPI=5
 HOMEPAGE=http://yum.baseurl.org/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_pypy? ( virtual/pypy:0=[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://yum.baseurl.org/download/yum-metadata-parser/yum-metadata-parser-1.1.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4f5c9a5fb2783a3f4942f4197a9b0f73
+_md5_=6a1a57a8eb9beaafaf5b895af60ee2c0
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.6.1 b/metadata/md5-cache/dev-python/statsmodels-0.6.1
index 540e0348084a..40f553f32a3d 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.6.1
+++ b/metadata/md5-cache/dev-python/statsmodels-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Statistical computations and models for use with SciPy
 EAPI=5
 HOMEPAGE=http://statsmodels.sourceforge.net/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-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/pandas-0.7.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/patsy-0.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(-)] >=sci-libs/scipy-0.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(-)] examples? ( dev-python/matplotlib[python_targets_python2_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/statsmodels/statsmodels-0.6.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b8220bc131c0180b1b33b57d0f586de1
+_md5_=977ad9c616e89a25c879c08ff1b4c46a
diff --git a/metadata/md5-cache/dev-python/stevedore-1.1.0 b/metadata/md5-cache/dev-python/stevedore-1.1.0
index a9817e8b29b5..baa8b9a3e41f 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.1.0
+++ b/metadata/md5-cache/dev-python/stevedore-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Manage dynamic plugins for Python applications
 EAPI=5
 HOMEPAGE=https://github.com/dreamhost/stevedore https://pypi.python.org/pypi/stevedore
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=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/s/stevedore/stevedore-1.1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d7767636d67fb929c878071a47e3dbde
+_md5_=ce0ba01f6c1149ed16347795f0bd19a0
diff --git a/metadata/md5-cache/dev-python/stsci-distutils-0.3.7 b/metadata/md5-cache/dev-python/stsci-distutils-0.3.7
index dde1ebb400dd..55733df454b1 100644
--- a/metadata/md5-cache/dev-python/stsci-distutils-0.3.7
+++ b/metadata/md5-cache/dev-python/stsci-distutils-0.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities used to package some of STScI's Python projects
 EAPI=5
 HOMEPAGE=http://www.stsci.edu/resources/software_hardware/stsci_python
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/d2to1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/stsci.distutils/stsci.distutils-0.3.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=cf8cc50586f21d57de7ac281b2e6c50b
+_md5_=4c2df52fdd8057ecb509cd165357359c
diff --git a/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1 b/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1
index d84a8f1227fd..4da7c2ae30d1 100644
--- a/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1
+++ b/metadata/md5-cache/dev-python/stsci-sphinxext-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools and templates to customize Sphinx for STScI projects
 EAPI=5
 HOMEPAGE=http://www.stsci.edu/resources/software_hardware/stsci_python
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpydoc[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 ) >=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/stsci.sphinxext/stsci.sphinxext-1.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=def2155095022dc31d9661b831aa2948
+_md5_=0e9f4b643a8c4faf68705e6671172068
diff --git a/metadata/md5-cache/dev-python/sure-1.2.5-r1 b/metadata/md5-cache/dev-python/sure-1.2.5-r1
index 578b164a8e0f..98cc0ff11fc9 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/sure-1.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=utility belt for automated testing in python for python
 EAPI=5
 HOMEPAGE=http://github.com/gabrielfalcao/sure
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/nose-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ~dev-python/rednose-0.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/gabrielfalcao/sure/archive/1.2.5.tar.gz -> sure-1.2.5-r1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=c5b96b3bde8ae43883427a8923c4f958
+_md5_=52bacd08ceff29410ee90a071f920ee9
diff --git a/metadata/md5-cache/dev-python/symboltype-1.0 b/metadata/md5-cache/dev-python/symboltype-1.0
index add78b9a6253..7ad364743172 100644
--- a/metadata/md5-cache/dev-python/symboltype-1.0
+++ b/metadata/md5-cache/dev-python/symboltype-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Gives access to the peak.util.symbols module
 EAPI=5
 HOMEPAGE=http://peak.telecommunity.com/DevCenter/SymbolType http://pypi.python.org/pypi/SymbolType
 IUSE=doc python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZPL
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/S/SymbolType/SymbolType-1.0.zip -> symboltype-1.0.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b20526b4998d91aa627a793e57261e67
+_md5_=b6987964de0e47c232af9e6c22c661b4
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r1 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r1
index 2a35c79eada4..28c0c1e83757 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=ANSII Color formatting for output in terminal
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/termcolor
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5fbb9ae2256eee0b4422755597bed182
+_md5_=a2439245515fe3f489c3719cbb71d279
diff --git a/metadata/md5-cache/dev-python/testfixtures-3.0.0 b/metadata/md5-cache/dev-python/testfixtures-3.0.0
index a9db581b1475..5dc1abc42ab0 100644
--- a/metadata/md5-cache/dev-python/testfixtures-3.0.0
+++ b/metadata/md5-cache/dev-python/testfixtures-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of helpers and mock objects for unit tests and doc test
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/testfixtures/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 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/t/testfixtures/testfixtures-3.0.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d1d3a8ff7354b166d7cddcb210d96337
+_md5_=b925b91034864257587aea51ffc69d76
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1 b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
index a53a6bf867ed..1902b4d32c8a 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A repository of test results
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/subunit-0.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/testtools-0.9.30[python_targets_python2_7(-)?,python_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[python_targets_python2_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/t/testrepository/testrepository-0.0.18.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e8df66bbde78e0f2337c1623302d0521
+_md5_=535b903363226abc2edeec9c359f7e65
diff --git a/metadata/md5-cache/dev-python/testresources-0.2.7-r2 b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
index 3d1870843390..8e090c41fbff 100644
--- a/metadata/md5-cache/dev-python/testresources-0.2.7-r2
+++ b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Testresources, a pyunit extension for managing expensive test resour
 EAPI=5
 HOMEPAGE=https://launchpad.net/testresources
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 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/t/testresources/testresources-0.2.7.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bac54ba2c70a92cb27f51ac5f436e777
+_md5_=d53690479a5768eb79d595aab3beae04
diff --git a/metadata/md5-cache/dev-python/timelib-0.2.4-r1 b/metadata/md5-cache/dev-python/timelib-0.2.4-r1
index e8c869988fa3..bb75bd4210cd 100644
--- a/metadata/md5-cache/dev-python/timelib-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/timelib-0.2.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=parse english textual date descriptions
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/timelib
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3.01 ZLIB
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/timelib/timelib-0.2.4.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7ce05175d906bde925d1f995191d03f4
+_md5_=dcff3e760e114855ca4468a0338376a5
diff --git a/metadata/md5-cache/dev-python/toolz-0.7.1 b/metadata/md5-cache/dev-python/toolz-0.7.1
index 515ffd8c2550..f771a5c399c0 100644
--- a/metadata/md5-cache/dev-python/toolz-0.7.1
+++ b/metadata/md5-cache/dev-python/toolz-0.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=List processing tools and functional utilities
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/toolz
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 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 ) >=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/t/toolz/toolz-0.7.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c7bf1463ceee063bb181d3f5f19c0c27
+_md5_=5ac2e72ab5566016cde4b4972f05c395
diff --git a/metadata/md5-cache/dev-python/tpg-3.2.2-r1 b/metadata/md5-cache/dev-python/tpg-3.2.2-r1
index 29d1fae00586..b88dfcdb2bf7 100644
--- a/metadata/md5-cache/dev-python/tpg-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/tpg-3.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Toy Parser Generator for Python
 EAPI=5
 HOMEPAGE=http://christophe.delord.free.fr/tpg/index.html
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~ia64 ppc ~x86
+KEYWORDS=amd64 ~ia64 ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=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=http://christophe.delord.free.fr/tpg/TPG-3.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5b547106981ee5d89a87536abb29b903
+_md5_=12e87465a37593f15efeda160963ecd8
diff --git a/metadata/md5-cache/dev-python/traits-4.5.0 b/metadata/md5-cache/dev-python/traits-4.5.0
index 3c2c93303f93..8d83849bb70b 100644
--- a/metadata/md5-cache/dev-python/traits-4.5.0
+++ b/metadata/md5-cache/dev-python/traits-4.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Explicitly typed attributes for Python
 EAPI=5
 HOMEPAGE=http://code.enthought.com/projects/traits/
 IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[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/t/traits/traits-4.5.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0f1c7772987968ab9b5c48980612e513
+_md5_=7d04a87e1dfdb34c9766e942dd47bcd0
diff --git a/metadata/md5-cache/dev-python/traitsui-4.4.0 b/metadata/md5-cache/dev-python/traitsui-4.4.0
index 865f0f4469b0..7e79be066bf4 100644
--- a/metadata/md5-cache/dev-python/traitsui-4.4.0
+++ b/metadata/md5-cache/dev-python/traitsui-4.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Traits-capable user interfaces
 EAPI=5
 HOMEPAGE=https://github.com/enthought/traitsui
 IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[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/t/traitsui/traitsui-4.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e82e2b6902431f5e3610a8388b82c6ef
+_md5_=f9f1e7caea7c4a62456b1d4372a163ee
diff --git a/metadata/md5-cache/dev-python/twisted-conch-13.2.0 b/metadata/md5-cache/dev-python/twisted-conch-13.2.0
index 3f999fc727fd..2ec2e48d07fe 100644
--- a/metadata/md5-cache/dev-python/twisted-conch-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-conch-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted SSHv2 implementation
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[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=http://twistedmatrix.com/Releases/Conch/13.2/TwistedConch-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6f129b9184da15cca06b3e0df2ea5a23
+_md5_=b60c9b78346ec48a398743b272e867b5
diff --git a/metadata/md5-cache/dev-python/twisted-core-13.2.0 b/metadata/md5-cache/dev-python/twisted-core-13.2.0
index 1996db554244..53c2db1a2adc 100644
--- a/metadata/md5-cache/dev-python/twisted-core-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-core-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=crypt gtk serial python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[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=http://twistedmatrix.com/Releases/Core/13.2/TwistedCore-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8cc4cf27069c2ebd9f1bc60b09e362e3
+_md5_=717361eecd19b355fb071080daea78cc
diff --git a/metadata/md5-cache/dev-python/twisted-lore-13.2.0 b/metadata/md5-cache/dev-python/twisted-lore-13.2.0
index 33a66e9abb00..5b71b1185b98 100644
--- a/metadata/md5-cache/dev-python/twisted-lore-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-lore-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted documentation system
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-13.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=http://twistedmatrix.com/Releases/Lore/13.2/TwistedLore-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9c0af76d08b1fe18ea15876a1180b13d
+_md5_=36c7a430e124f23c97f85c0c312022c4
diff --git a/metadata/md5-cache/dev-python/twisted-mail-13.2.0 b/metadata/md5-cache/dev-python/twisted-mail-13.2.0
index 930a8107d909..55d678ce6910 100644
--- a/metadata/md5-cache/dev-python/twisted-mail-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-mail-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Twisted Mail library, server and client
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-names-13.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=http://twistedmatrix.com/Releases/Mail/13.2/TwistedMail-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=db1af7efaa09b16cc3ec64de8dddc7c9
+_md5_=15b5d2171826b9319eb29b9a2cf3bb12
diff --git a/metadata/md5-cache/dev-python/twisted-names-13.2.0 b/metadata/md5-cache/dev-python/twisted-names-13.2.0
index 2008bd252686..7d3fca271658 100644
--- a/metadata/md5-cache/dev-python/twisted-names-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-names-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Twisted DNS implementation
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.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=http://twistedmatrix.com/Releases/Names/13.2/TwistedNames-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9da9724b09c8acdbf4d172ee59f3572d
+_md5_=7755aedc57b314f9829e3f4a8e14484e
diff --git a/metadata/md5-cache/dev-python/twisted-news-13.2.0 b/metadata/md5-cache/dev-python/twisted-news-13.2.0
index c691535d61c8..20525f243a7a 100644
--- a/metadata/md5-cache/dev-python/twisted-news-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-news-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted News is an NNTP server and programming library
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-mail-13.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=http://twistedmatrix.com/Releases/News/13.2/TwistedNews-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4073d3f48fe0d4543a4a72d42621d2be
+_md5_=93f5969b900fa9defcf81c7aa2120ff9
diff --git a/metadata/md5-cache/dev-python/twisted-pair-13.2.0 b/metadata/md5-cache/dev-python/twisted-pair-13.2.0
index afdc6ddb20cf..3dafb2529fcf 100644
--- a/metadata/md5-cache/dev-python/twisted-pair-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-pair-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted low-level networking
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eunuchs[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=http://twistedmatrix.com/Releases/Pair/13.2/TwistedPair-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=32df614cc3f57e75ed420b06d175e9dc
+_md5_=7ac87c31dfc7ab8ad8d74d9f8f900d08
diff --git a/metadata/md5-cache/dev-python/twisted-runner-13.2.0 b/metadata/md5-cache/dev-python/twisted-runner-13.2.0
index 2a6980629c7a..a5ce094fb740 100644
--- a/metadata/md5-cache/dev-python/twisted-runner-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-runner-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted Runner is a process management library and inetd replacement
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.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=http://twistedmatrix.com/Releases/Runner/13.2/TwistedRunner-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=502386d4593eeb5c5dd3349748144985
+_md5_=3c9f42f1c12f5c0061b68502fd54b772
diff --git a/metadata/md5-cache/dev-python/twisted-web-13.2.0 b/metadata/md5-cache/dev-python/twisted-web-13.2.0
index 0461da892e25..7c9249c053e0 100644
--- a/metadata/md5-cache/dev-python/twisted-web-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-web-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted web server, programmable in Python
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=soap python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[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=http://twistedmatrix.com/Releases/Web/13.2/TwistedWeb-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ce6bff6d899edcc9a64bc246e9368c77
+_md5_=a2249545905fc82a17c21c30382efad8
diff --git a/metadata/md5-cache/dev-python/twisted-words-13.2.0 b/metadata/md5-cache/dev-python/twisted-words-13.2.0
index 42606203b6fe..31fd61cb91ae 100644
--- a/metadata/md5-cache/dev-python/twisted-words-13.2.0
+++ b/metadata/md5-cache/dev-python/twisted-words-13.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted Words contains Instant Messaging implementations
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND==dev-python/twisted-core-13.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-13.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=http://twistedmatrix.com/Releases/Words/13.2/TwistedWords-13.2.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=15e8a2472b97aa4b72d9f3f73d503be1
+_md5_=434346aef24250247020a590905b1a3e
diff --git a/metadata/md5-cache/dev-python/twython-3.2.0 b/metadata/md5-cache/dev-python/twython-3.2.0
index 7d23e4021290..5b90296c86ad 100644
--- a/metadata/md5-cache/dev-python/twython-3.2.0
+++ b/metadata/md5-cache/dev-python/twython-3.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=An easy (and up to date) way to access Twitter data with Python
 EAPI=5
 HOMEPAGE=https://github.com/ryanmcgrath/twython
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-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/requests-oauthlib-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(-)] 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/t/twython/twython-3.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6d863d4b5a018b85edfbaa85e5727130
+_md5_=af7fff63d6c5584fe7622db6be872cea
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.6.2 b/metadata/md5-cache/dev-python/txAMQP-0.6.2
index abc0864fcba4..33ec59b1496d 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.6.2
+++ b/metadata/md5-cache/dev-python/txAMQP-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for communicating with AMQP peers using Twisted
 EAPI=5
 HOMEPAGE=https://launchpad.net/txamqp
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/twisted-core 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/txAMQP/txAMQP-0.6.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c1b6dadd206d9a6a0a184a184c7fde1f
+_md5_=3dadf6012440c2db3ea229a95c0e0efd
diff --git a/metadata/md5-cache/dev-python/ujson-1.33 b/metadata/md5-cache/dev-python/ujson-1.33
index 48aabbdb45c9..f9bd2ced5ad1 100644
--- a/metadata/md5-cache/dev-python/ujson-1.33
+++ b/metadata/md5-cache/dev-python/ujson-1.33
@@ -4,11 +4,11 @@ DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/ujson/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 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(-)] app-arch/unzip 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/u/ujson/ujson-1.33.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=775c6e6b07f9c78b22ab01002c5338da
+_md5_=87f5c000a8fd9437ba290e5e70917cd8
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.9.4 b/metadata/md5-cache/dev-python/unicodecsv-0.9.4
index 38190e084447..7c8d9f6ff09a 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.9.4
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=Drop-in replacement for python stdlib csv module supporting unicode
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/unicodecsv
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unicodecsv/unicodecsv-0.9.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fe625c6da64ee0338fd824968782f6f6
+_md5_=195f674b65cde7e126961e0b9a27e329
diff --git a/metadata/md5-cache/dev-python/uritemplate-0.6 b/metadata/md5-cache/dev-python/uritemplate-0.6
index 0da016ae481f..6f42a5becdd5 100644
--- a/metadata/md5-cache/dev-python/uritemplate-0.6
+++ b/metadata/md5-cache/dev-python/uritemplate-0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Python implementation of RFC6570, URI Template
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/uritemplate
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] !<=dev-python/google-api-python-client-1.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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-0.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=52ed9a3fc28b764bf8fc3cd4de5c526c
+_md5_=af357a75a3cec0e6c9fbf3ae2dbc669c
diff --git a/metadata/md5-cache/dev-python/urllib3-1.9.1 b/metadata/md5-cache/dev-python/urllib3-1.9.1
index 71da7ac1ce52..a4e478dc2b14 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.9.1
+++ b/metadata/md5-cache/dev-python/urllib3-1.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=5
 HOMEPAGE=https://github.com/shazow/urllib3
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.9.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2706c942efe2529e3ed2a32aff0335c8
+_md5_=9e3fdf19fea5954e5101fbeb43b83e04
diff --git a/metadata/md5-cache/dev-python/venusian-1.0 b/metadata/md5-cache/dev-python/venusian-1.0
index e0a161f476d6..cf8e26a970ef 100644
--- a/metadata/md5-cache/dev-python/venusian-1.0
+++ b/metadata/md5-cache/dev-python/venusian-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A library for deferring decorator actions
 EAPI=5
 HOMEPAGE=http://www.pylonsproject.org/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze
 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/v/venusian/venusian-1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c66acfb78e0979dffc17eb002c82ce21
+_md5_=90fdce5c2063d85de0896fe4396407f9
diff --git a/metadata/md5-cache/dev-python/versiontools-1.9.1-r1 b/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
index 7072d6b59205..b6174f799433 100644
--- a/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Smart replacement for plain tuple used in __version__
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/versiontools/ https://launchpad.net/versiontools
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/v/versiontools/versiontools-1.9.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5e35c2fb246ef969327776e0bee91e69
+_md5_=c6fa2c157f87929a6e6b73dfbce081c9
diff --git a/metadata/md5-cache/dev-python/vertex-0.3.0-r1 b/metadata/md5-cache/dev-python/vertex-0.3.0-r1
index 99684b3fd3ef..d153027c2917 100644
--- a/metadata/md5-cache/dev-python/vertex-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/vertex-0.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of the Q2Q protocol
 EAPI=5
 HOMEPAGE=http://divmod.org/trac/wiki/DivmodVertex http://pypi.python.org/pypi/Vertex
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/openssl >=dev-python/epsilon-0.6.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[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/V/Vertex/Vertex-0.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5b07e758d009b9c3db7b550a1682910c
+_md5_=aa6de2b68b15652f3aee6f2dbff5622f
diff --git a/metadata/md5-cache/dev-python/waitress-0.8.9 b/metadata/md5-cache/dev-python/waitress-0.8.9
index 4b9f8cd9d363..0f5bad7c03c4 100644
--- a/metadata/md5-cache/dev-python/waitress-0.8.9
+++ b/metadata/md5-cache/dev-python/waitress-0.8.9
@@ -4,11 +4,11 @@ DESCRIPTION=A pure-Python WSGI server
 EAPI=5
 HOMEPAGE=http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-0.8.9.tar.gz doc? ( http://dev.gentoo.org/~idella4/pylons_sphinx_theme.tar.gz )
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e68320a508abadffe2e901a466844b14
+_md5_=862b79c843f37f1d0a599b584a12c4bb
diff --git a/metadata/md5-cache/dev-python/warlock-1.0.1 b/metadata/md5-cache/dev-python/warlock-1.0.1
index 3fd2eeebf829..542043c9cab1 100644
--- a/metadata/md5-cache/dev-python/warlock-1.0.1
+++ b/metadata/md5-cache/dev-python/warlock-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python object model built on JSON schema and JSON patch
 EAPI=5
 HOMEPAGE=http://github.com/bcwaldon/warlock
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonpatch-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonpatch-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-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/w/warlock/warlock-1.0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=aca81e580e8e2c4d0111a98b4e325363
+_md5_=180d26e39ebf4e669daf39ce8a11ae72
diff --git a/metadata/md5-cache/dev-python/webassets-0.10.1 b/metadata/md5-cache/dev-python/webassets-0.10.1
index bddba22ad6fa..e44ac7481a0a 100644
--- a/metadata/md5-cache/dev-python/webassets-0.10.1
+++ b/metadata/md5-cache/dev-python/webassets-0.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=Asset management for Python web development
 EAPI=5
 HOMEPAGE=https://github.com/miracle2k/webassets
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/webassets/archive/0.10.1.tar.gz -> webassets-0.10.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=79d74e5c2167639abfef3acedfcd0341
+_md5_=78f944bf3cf07615a1de817a1e57b2b2
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.21.0 b/metadata/md5-cache/dev-python/websocket-client-0.21.0
index 8771fe6f8311..b0f4de213f52 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.21.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.21.0
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket client for python. hybi13 is supported
 EAPI=5
 HOMEPAGE=https://github.com/liris/websocket-client
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://github.com/liris/websocket-client/archive/v0.21.0.tar.gz -> websocket-client-0.21.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=3b2a2055d4080594651980736896d850
+_md5_=54c50a1de6ed313add7ac5692ec78dad
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.16 b/metadata/md5-cache/dev-python/webtest-2.0.16
index b34af1a22207..5a3a9a91f313 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.16
+++ b/metadata/md5-cache/dev-python/webtest-2.0.16
@@ -4,11 +4,11 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/webtest/ http://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/waitress-0.8.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/webob-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/beautifulsoup: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/lxml[python_targets_python2_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/W/WebTest/WebTest-2.0.16.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f2d4bc270d78f677b8711e5cdb9bc8b6
+_md5_=8185be1463d3e438f8ccf81d6f94c453
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.13 b/metadata/md5-cache/dev-python/whisper-0.9.13
index d4f6a5999621..6ae9ce42a8a8 100644
--- a/metadata/md5-cache/dev-python/whisper-0.9.13
+++ b/metadata/md5-cache/dev-python/whisper-0.9.13
@@ -4,11 +4,11 @@ DESCRIPTION=Fixed size round-robin style database
 EAPI=5
 HOMEPAGE=http://graphite.wikidot.com/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/w/whisper/whisper-0.9.13.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ce790b64542de77d73ad6fcc550af9e0
+_md5_=40fdf8dc68f724180797d6e2a57bb85f
diff --git a/metadata/md5-cache/dev-python/ws4py-0.3.4 b/metadata/md5-cache/dev-python/ws4py-0.3.4
index 96a3d5552e16..52fa8535efe3 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.3.4
+++ b/metadata/md5-cache/dev-python/ws4py-0.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket client and server library for Python 2 and 3 as well as Py
 EAPI=5
 HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
 IUSE=+client +server test +threads python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=>=dev-python/greenlet-0.4.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-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.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(-)] client? ( >=www-servers/tornado-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(-)] ) server? ( >=dev-python/cherrypy-3.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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads?] ) python_targets_python3_4? ( dev-lang/python:3.4[threads?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/tarball/v0.3.4 -> ws4py-0.3.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=4cea71589493a041309012305af47bdb
+_md5_=4e9bdcb3134d32aac22f782ec775a258
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.2 b/metadata/md5-cache/dev-python/wsaccel-0.6.2
index 8d2861da227f..e2987138fccc 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.2
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=Accelerator for ws4py, AutobahnPython and tornado
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/wsaccel https://github.com/methane/wsaccel
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 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/w/wsaccel/wsaccel-0.6.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=88c7c808e9373f50b312e24a47966b57
+_md5_=77c67526b2475919d66087a9922f0ed2
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1
index 203fe185a2fe..0b3f8275f77b 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP proxying tools for WSGI apps
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/wsgiproxy/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_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[python_targets_python2_7(-)?,python_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[python_targets_python2_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/W/WSGIProxy2/WSGIProxy2-0.4.1.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=64d303149032724a8ccee55a6384dd8d
+_md5_=f65bfd6af464ebf8319e79ea063a808b
diff --git a/metadata/md5-cache/dev-python/xcffib-0.1.10 b/metadata/md5-cache/dev-python/xcffib-0.1.10
index 91bf17d24842..108012b5fdf1 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.1.10
+++ b/metadata/md5-cache/dev-python/xcffib-0.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=5
 HOMEPAGE=http://github.com/tych0/xcffib
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cffi-0.8.2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] x11-libs/libxcb 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.1.10.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a74aa3cc73bc88c9f810fd2292190114
+_md5_=72f815e4745bef51876c75835294f123
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.6.4 b/metadata/md5-cache/dev-python/xlsxwriter-0.6.4
index a05bf8163bfc..8cd61c07aa74 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.6.4
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for creating Excel XLSX files
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 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_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XlsxWriter/XlsxWriter-0.6.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=fbd8633f242ea632ea26afc923f2608a
+_md5_=4aa20aa32a9927058b8fa6abb9eaf112
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.4 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.4
index 20140c7dbccb..633d4e22817b 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.4
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper for running a display inside X virtual framebuffer
 EAPI=5
 HOMEPAGE=https://github.com/cgoldberg/xvfbwrapper http://pypi.python.org/pypi/xvfbwrapper
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xvfb] 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=b4b23684b2118fdfe8b1bcecc6d7afda
+_md5_=a9771ef84a1ed0611fcaf60a5ab4b770
diff --git a/metadata/md5-cache/dev-python/yolk-0.4.3-r1 b/metadata/md5-cache/dev-python/yolk-0.4.3-r1
index b44110c29802..e52516b4f8f9 100644
--- a/metadata/md5-cache/dev-python/yolk-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/yolk-0.4.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool and library for querying PyPI and locally installed Python pack
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/yolk
 IUSE=examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools dev-python/yolk-portage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/y/yolk/yolk-0.4.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=06907f03d971345878a7757787b6004b
+_md5_=4f2ab26b2bc95dd528921afde5b41d80
diff --git a/metadata/md5-cache/dev-python/yolk-portage-0.1-r1 b/metadata/md5-cache/dev-python/yolk-portage-0.1-r1
index e67ffbfd7ab5..7afaec9ef7df 100644
--- a/metadata/md5-cache/dev-python/yolk-portage-0.1-r1
+++ b/metadata/md5-cache/dev-python/yolk-portage-0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo Portage plugin for yolk
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/yolk-portage
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-portage/portage-utils-0.1.23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/y/yolk-portage/yolk-portage-0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=de9a4a126c73ee8b26bcbbdb97d2a7c9
+_md5_=631711795d45a677392ebfc9a21a8292
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
index f7021e99c1a0..91fbed62e28e 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A binary search library for Ruby
 EAPI=5
 HOMEPAGE=http://0xcc.net/ruby-bsearch/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bsearch-1.5.0.gem
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bb8a29993a718063b0f0929e6b526096
+_md5_=ddb0d5afc0ac821bce626d99cb8d1f92
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
new file mode 100644
index 000000000000..d3bcfa72cb3d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A binary search library for Ruby
+EAPI=5
+HOMEPAGE=http://0xcc.net/ruby-bsearch/
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/bsearch-1.5.0.gem
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ac71839da833fdf58e29cc674a369eec
diff --git a/metadata/md5-cache/dev-ruby/bson-1.12.0 b/metadata/md5-cache/dev-ruby/bson-1.12.0
index 9e4f8bc9e46b..5fb68d34026f 100644
--- a/metadata/md5-cache/dev-ruby/bson-1.12.0
+++ b/metadata/md5-cache/dev-ruby/bson-1.12.0
@@ -9,6 +9,6 @@ LICENSE=APSL-2
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/v1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
+SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f574d407f704e4f11c459aeb72caf304
+_md5_=be3af327222db730daae5ecb371c55c1
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.4 b/metadata/md5-cache/dev-ruby/cocaine-0.5.4
deleted file mode 100644
index 0d823f3650d5..000000000000
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby19] <dev-ruby/activesupport-5[ruby_targets_ruby19] dev-ruby/bourne[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=A small library for doing command lines
-EAPI=5
-HOMEPAGE=http://www.thoughtbot.com/projects/cocaine
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubygems/cocaine-0.5.4.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=97065509b84704f38cfddf34acdaa78b
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.4-r1 b/metadata/md5-cache/dev-ruby/cocaine-0.5.4-r1
deleted file mode 100644
index fca31a7fb557..000000000000
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/climate_control:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/climate_control:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby19] <dev-ruby/activesupport-5[ruby_targets_ruby19] dev-ruby/bourne[ruby_targets_ruby19] <dev-ruby/mocha-1.0.0[ruby_targets_ruby19] dev-ruby/posix-spawn[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby20] <dev-ruby/activesupport-5[ruby_targets_ruby20] dev-ruby/bourne[ruby_targets_ruby20] <dev-ruby/mocha-1.0.0[ruby_targets_ruby20] dev-ruby/posix-spawn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activesupport-3[ruby_targets_ruby21] <dev-ruby/activesupport-5[ruby_targets_ruby21] dev-ruby/bourne[ruby_targets_ruby21] <dev-ruby/mocha-1.0.0[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A small library for doing command lines
-EAPI=5
-HOMEPAGE=http://www.thoughtbot.com/projects/cocaine
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/climate_control:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/climate_control:0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/cocaine-0.5.4.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d6018e8182f2c6ebae6f266bdc32a377
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.0 b/metadata/md5-cache/dev-ruby/coffee-rails-4.0.0
deleted file mode 100644
index d93fa4b1e2a4..000000000000
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby19] =dev-ruby/railties-4*[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Coffee Script adapter for the Rails asset pipeline
-EAPI=5
-HOMEPAGE=https://github.com/rails/coffee-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby19] =dev-ruby/railties-4*[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=4.0
-SRC_URI=mirror://rubygems/coffee-rails-4.0.0.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a762941464ec242c0726ea69c7e9be70
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.0 b/metadata/md5-cache/dev-ruby/daemons-1.2.0
new file mode 100644
index 000000000000..cc5dde085153
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
+EAPI=5
+HOMEPAGE=https://github.com/thuehlinger/daemons
+IUSE=examples elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/daemons-1.2.0.gem
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f16c648de5427fe653a9fd9edf4fde57
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.8 b/metadata/md5-cache/dev-ruby/dbf-2.0.8
index cfb5e38287e1..14ed734b5fd4 100644
--- a/metadata/md5-cache/dev-ruby/dbf-2.0.8
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro da
 EAPI=5
 HOMEPAGE=https://github.com/infused/dbf
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-2.0.8.gem
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=35cce5d9eaec4a5397f857d6b779abd5
+_md5_=eabba89c17b2f963e509974850f092b2
diff --git a/metadata/md5-cache/dev-ruby/mongo-1.12.0 b/metadata/md5-cache/dev-ruby/mongo-1.12.0
index 3b13978d687d..0d8c792a09d4 100644
--- a/metadata/md5-cache/dev-ruby/mongo-1.12.0
+++ b/metadata/md5-cache/dev-ruby/mongo-1.12.0
@@ -9,6 +9,6 @@ LICENSE=APSL-2
 RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/bson-1.12.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/bson-1.12.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/bson-1.12.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/v1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
+SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f360375309a4037f9a895868d061831d
+_md5_=aab48d4c1ba79d1078ba35a07c597978
diff --git a/metadata/md5-cache/dev-tcltk/anigif-1.3-r1 b/metadata/md5-cache/dev-tcltk/anigif-1.3-r1
new file mode 100644
index 000000000000..3be5022ba911
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/anigif-1.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Image rotation package
+EAPI=5
+HOMEPAGE=http://cardtable.sourceforge.net/tcltk/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=tcltk
+RDEPEND=dev-lang/tcl
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/anigif-1.3.zip
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=812621f29fe0d461b9d2c5610091f58e
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.7 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.7
index f308605554d6..85dd6e469db6 100644
--- a/metadata/md5-cache/dev-tcltk/bwidget-1.9.7
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=High-level widget set for Tcl/Tk
 EAPI=5
 HOMEPAGE=http://tcllib.sourceforge.net/
 IUSE=doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=tcltk
 RDEPEND=dev-lang/tk
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/bwidget-1.9.7.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8a2befcd9304a94718f996935ef6d1db
+_md5_=2ef194fc88fc0c44c4e0129d255336bb
diff --git a/metadata/md5-cache/dev-util/fatrace-0.9 b/metadata/md5-cache/dev-util/fatrace-0.9
new file mode 100644
index 000000000000..78abd3c3b212
--- /dev/null
+++ b/metadata/md5-cache/dev-util/fatrace-0.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=powertop? ( 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=report file access events from all running processes
+EAPI=5
+HOMEPAGE=https://launchpad.net/fatrace
+IUSE=powertop python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=powertop? ( 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=powertop? ( || ( python_targets_python3_3 python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=https://launchpad.net/fatrace/trunk/0.9/+download/fatrace-0.9.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c8308557c0cbe53414a278972ff52e11
diff --git a/metadata/md5-cache/dev-vcs/notify-webhook-20140805 b/metadata/md5-cache/dev-vcs/notify-webhook-20140805
new file mode 100644
index 000000000000..93925dd2438c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/notify-webhook-20140805
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-python/simplejson
+DESCRIPTION=Git post-receive web hook notifier in Python.
+EAPI=5
+HOMEPAGE=https://github.com/metajack/notify-webhook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/simplejson
+SLOT=0
+SRC_URI=https://github.com/metajack/notify-webhook/archive/c571160f155122446e97bb01c1150b4d14ea69d6.tar.gz -> notify-webhook-20140805.tar.gz
+_md5_=cf9867870ba5c69c002f3ce529fa5a83
diff --git a/metadata/md5-cache/dev-vcs/notify-webhook-20150308 b/metadata/md5-cache/dev-vcs/notify-webhook-20150308
new file mode 100644
index 000000000000..5ed70fc0481e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/notify-webhook-20150308
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=dev-python/simplejson dev-util/patchutils
+DESCRIPTION=Git post-receive web hook notifier in Python.
+EAPI=5
+HOMEPAGE=https://github.com/metajack/notify-webhook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/simplejson
+SLOT=0
+SRC_URI=https://github.com/metajack/notify-webhook/archive/1ff39853e59bb0ee37c4783da8dcf3ea14cef53f.tar.gz -> notify-webhook-20150308.tar.gz https://github.com/metajack/notify-webhook/compare/1ff3985...BCLibCoop:ee038b5.patch -> notify-webhook-20150308-1ff3985...BCLibCoop:ee038b5.patch
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=41749f1b5e5fefa38072ddcabfcd7781
diff --git a/metadata/md5-cache/games-action/descent1-demodata-1.4 b/metadata/md5-cache/games-action/descent1-demodata-1.4
index d7a6c2fe6834..f365878a1b74 100644
--- a/metadata/md5-cache/games-action/descent1-demodata-1.4
+++ b/metadata/md5-cache/games-action/descent1-demodata-1.4
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip app-arch/unarj
 DESCRIPTION=Demo data files for Descent 1
 EAPI=5
 HOMEPAGE=http://en.wikipedia.org/wiki/Descent_%28computer_game%29
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=free-noncomm
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://icculus.org/d2x/data/desc14sw.exe mirror://3dgamers/descent/desc14sw.exe ftp://ftp.funet.fi/pub/msdos/games/interplay/desc14sw.exe
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=040f76e9cda4412613311bddabd9eee4
+_md5_=b1bbb109576f7310f5134899538f1dbc
diff --git a/metadata/md5-cache/games-action/teeworlds-0.6.3 b/metadata/md5-cache/games-action/teeworlds-0.6.3
index ec6316e1595b..033bf85c439c 100644
--- a/metadata/md5-cache/games-action/teeworlds-0.6.3
+++ b/metadata/md5-cache/games-action/teeworlds-0.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Online multi-player platform 2D shooter
 EAPI=5
 HOMEPAGE=http://www.teeworlds.com/
 IUSE=debug dedicated
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=!dedicated? ( media-libs/pnglite media-libs/libsdl[X,sound,opengl,video] media-sound/wavpack virtual/opengl app-arch/bzip2 media-libs/freetype virtual/glu x11-libs/libX11 ) sys-libs/zlib games-misc/games-envd
 SLOT=0
 SRC_URI=https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=cd555b6d74e804068450b3f8f6719dc7
+_md5_=375f9f80f288d4824d667703d147005d
diff --git a/metadata/md5-cache/games-arcade/cob-0.9 b/metadata/md5-cache/games-arcade/cob-0.9
index 164909d04a5f..9a8641998a27 100644
--- a/metadata/md5-cache/games-arcade/cob-0.9
+++ b/metadata/md5-cache/games-arcade/cob-0.9
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[joystick,sound,video]
 DESCRIPTION=Cruising on Broadway: a painting-type game
 EAPI=5
 HOMEPAGE=http://www.autismuk.freeserve.co.uk/
-KEYWORDS=alpha ~amd64 ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ppc ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick,sound,video] games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.autismuk.freeserve.co.uk/cob-0.9.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1eade100b00256a3e3da65cdd2da4bfe
+_md5_=451f11a4dabc2e9db905eafb7bd061be
diff --git a/metadata/md5-cache/games-arcade/insaneodyssey-000311 b/metadata/md5-cache/games-arcade/insaneodyssey-000311
index 0a958ef1f730..674cb0bfcfa0 100644
--- a/metadata/md5-cache/games-arcade/insaneodyssey-000311
+++ b/metadata/md5-cache/games-arcade/insaneodyssey-000311
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image
 DESCRIPTION=Help West Muldune escape from a futuristic mental hospital
 EAPI=5
 HOMEPAGE=http://members.fortunecity.com/rivalentertainment/iox.html
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/io000311.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=3a9d36ad237a8147d75d20666140fae7
+_md5_=2d3fcb7bb7269122657e3015d78cdd50
diff --git a/metadata/md5-cache/games-board/freedoko-0.7.13 b/metadata/md5-cache/games-board/freedoko-0.7.13
index 86e57ad7242b..002d11cf7e1c 100644
--- a/metadata/md5-cache/games-board/freedoko-0.7.13
+++ b/metadata/md5-cache/games-board/freedoko-0.7.13
@@ -4,10 +4,10 @@ DESCRIPTION=FreeDoko is a Doppelkopf-game
 EAPI=5
 HOMEPAGE=http://free-doko.sourceforge.net
 IUSE=+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=net? ( net-libs/gnet dev-libs/glib:2 ) >=dev-cpp/gtkmm-2.4:2.4 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/free-doko/FreeDoko_0.7.13.src.zip backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> freedoko-backgrounds.zip ) kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) !xskatcards? ( !kdecards? ( !gnomecards? ( !openclipartcards? ( !pysolcards? ( mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f979d8c87e51d7c0972c13a4cf262fc0
+_md5_=80aaa664b5dd5e00e4683a2fc53d53ba
diff --git a/metadata/md5-cache/games-emulation/yabause-0.9.12 b/metadata/md5-cache/games-emulation/yabause-0.9.12
deleted file mode 100644
index 9a770fe7afba..000000000000
--- a/metadata/md5-cache/games-emulation/yabause-0.9.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 opengl? ( dev-qt/qtopengl:4 ) ) !qt4? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl[opengl?,video] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A Sega Saturn emulator
-EAPI=5
-HOMEPAGE=http://yabause.org/
-IUSE=openal opengl qt4 sdl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 opengl? ( dev-qt/qtopengl:4 ) ) !qt4? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl[opengl?,video] ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/yabause/yabause-0.9.12.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2e67f1f988b90366c46191e7e6190f7d
diff --git a/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1 b/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1
index a76e7edaa2bf..2c27f8439786 100644
--- a/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1
+++ b/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=math-version of the popular board game for children 4-10
 EAPI=5
 HOMEPAGE=http://www.asymptopia.org/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/asymptopia/tuxmathscrabble/archive/0.8.1.tar.gz -> tuxmathscrabble-0.8.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=6b3ea3a3b96814c295533bc930b76cbf
+_md5_=e83dcb7ce0566a3c2052a6862764bc60
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.4.4 b/metadata/md5-cache/games-strategy/freeciv-2.4.4
index 5aa38057aa2c..2090cef42b3e 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.4.4
+++ b/metadata/md5-cache/games-strategy/freeciv-2.4.4
@@ -4,10 +4,10 @@ DESCRIPTION=multiplayer strategy game (Civilization Clone)
 EAPI=5
 HOMEPAGE=http://www.freeciv.org/
 IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls postgres readline sdl +server +sound sqlite
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-lang/lua net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0 ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/freetype:2 ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freeciv/freeciv-2.4.4.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=65f88f4101a9d673413ae496b7ab754a
+_md5_=26a4b8c340df49920bc26710d01e3896
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.1.2 b/metadata/md5-cache/games-strategy/warzone2100-3.1.2
index 49be6174cc8e..129447d2f284 100644
--- a/metadata/md5-cache/games-strategy/warzone2100-3.1.2
+++ b/metadata/md5-cache/games-strategy/warzone2100-3.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=3D real-time strategy game
 EAPI=5
 HOMEPAGE=http://wz2100.net/
 IUSE=debug nls qt4 videos
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2 CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-games/physfs-2[zip] dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 media-libs/glew media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr dev-qt/qtcore:4 dev-qt/qtscript:4 nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) !qt4? ( media-libs/libsdl[opengl,video] ) media-fonts/dejavu games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.1.2.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2f2e116e32b60e57aeaa80ffe239877c
+_md5_=85e941a8b5e04c430bf851de836ad714
diff --git a/metadata/md5-cache/games-util/joystick-1.4.8 b/metadata/md5-cache/games-util/joystick-1.4.8
index 02cd5fcc0851..70c8455ac4ad 100644
--- a/metadata/md5-cache/games-util/joystick-1.4.8
+++ b/metadata/md5-cache/games-util/joystick-1.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=joystick testing utilities
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
 IUSE=sdl
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.4.8.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0f78dff65bf52767d76ac44ea35ddd98
+_md5_=53ae3f1573443c0a099a02b43ef91fee
diff --git a/metadata/md5-cache/games-util/wxchtdecoder-1.5a b/metadata/md5-cache/games-util/wxchtdecoder-1.5a
index 0362623c9220..6c22ffcb5fa3 100644
--- a/metadata/md5-cache/games-util/wxchtdecoder-1.5a
+++ b/metadata/md5-cache/games-util/wxchtdecoder-1.5a
@@ -3,10 +3,10 @@ DEPEND=x11-libs/wxGTK:2.8[X]
 DESCRIPTION=A program to decode .CHT files in Snes9x and ZSNES to plain text
 EAPI=5
 HOMEPAGE=http://games.technoplaza.net/chtdecoder/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=mirror://gentoo/wxchtdecoder-1.5a.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=cba2b83ef5774f4a959dbee47b347bc6
+_md5_=2e9f863daf65a621bb25d2329e7f3be3
diff --git a/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1 b/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
index 5efd84b8252c..0a9c5785c864 100644
--- a/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
+++ b/metadata/md5-cache/media-fonts/anonymous-pro-1.002-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst postrm setup
 DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=Monospaced truetype font designed with coding in mind
 EAPI=5
-HOMEPAGE=http://www.ms-studio.com/FontSales/anonymouspro.html
+HOMEPAGE=http://www.marksimonson.com/fonts/view/anonymous-pro
 IUSE=X
 KEYWORDS=amd64 arm ~arm64 x86 ~x64-macos
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=http://www.ms-studio.com/FontSales/AnonymousPro-1.002.zip
+SRC_URI=http://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	font	b3239d2dc442d1717b9725e2be7cb5d6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9f0a2b1511b4fba5bf6e0579dff74b7f
+_md5_=0f5b27eda4f2932e9282925c648c6345
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.8.0 b/metadata/md5-cache/media-gfx/ristretto-0.8.0
new file mode 100644
index 000000000000..e596a66e8fa4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ristretto-0.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0= dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=A fast and lightweight picture viewer for the Xfce desktop environment
+EAPI=5
+HOMEPAGE=http://goodies.xfce.org/projects/applications/ristretto
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0=
+SLOT=0
+SRC_URI=mirror://xfce/src/apps/ristretto/0.8/ristretto-0.8.0.tar.bz2
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_md5_=baac721bbe760447f45e7cf96091fd98
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.5 b/metadata/md5-cache/media-libs/libvorbis-1.3.5
new file mode 100644
index 000000000000..b079240bda16
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) app-arch/xz-utils virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The Ogg Vorbis sound file format library
+EAPI=5
+HOMEPAGE=http://xiph.org/vorbis
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=81ff3ca0e24938dd0234ccdc9ef1a534
diff --git a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r1 b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r1
index 74957270b97f..13047c4d87a6 100644
--- a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r1
@@ -3,12 +3,13 @@ DEPEND=dev-libs/glib:2 >=dev-libs/boost-1.40:= qt4? ( dev-qt/qtcore:4 dev-qt/qtd
 DESCRIPTION=QtGStreamer provides C++ bindings for GStreamer with a Qt-style API
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/modules/qt-gstreamer.html
-IUSE=qt4 qt5 test
+IUSE=+qt4 qt5 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=dev-libs/boost-1.40:= qt4? ( dev-qt/qtcore:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtquick1:5 dev-qt/qtwidgets:5 ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0
+REQUIRED_USE=|| ( qt4 qt5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-1.2.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=816b49efcbc7e7cbc74310ddf83a74d6
+_md5_=c5cef2740702cfbae1c2b3764bb81599
diff --git a/metadata/md5-cache/media-libs/sdl-flic-1.2 b/metadata/md5-cache/media-libs/sdl-flic-1.2
deleted file mode 100644
index e2a8ebd51010..000000000000
--- a/metadata/md5-cache/media-libs/sdl-flic-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=media-libs/libsdl
-DESCRIPTION=FLIC animation file loading library
-HOMEPAGE=http://www.libsdl.org/
-KEYWORDS=alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/libsdl
-SLOT=0
-SRC_URI=mirror://gentoo/SDL_flic-12.tgz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bef44cf9801dbf8e31aa5d0488e3c12b
diff --git a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1 b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1
index 05d5778e8d28..4abc5d7eb742 100644
--- a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1
+++ b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Graphics drawing primitives library for SDL2
 EAPI=5
 HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
 IUSE=doc cpu_flags_x86_mmx 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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.1-r1[video,abi_x86_32(-)?,abi_x86_64(-)?,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=http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c8c3721e74fc8e9491d0e2392982524c
+_md5_=b539b702b46f09c7a309df975ef6e466
diff --git a/metadata/md5-cache/media-video/baka-mplayer-2.0.2 b/metadata/md5-cache/media-video/baka-mplayer-2.0.2
index 45af689ab71d..aadc04ff6e9f 100644
--- a/metadata/md5-cache/media-video/baka-mplayer-2.0.2
+++ b/metadata/md5-cache/media-video/baka-mplayer-2.0.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/mpv[libmpv] virtual/pkgconfig
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/mpv[libmpv] x11-libs/libX11 virtual/pkgconfig
 DESCRIPTION=Cross-platform libmpv-based multimedia player with uncluttered design
 EAPI=5
 HOMEPAGE=http://bakamplayer.u8sand.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/mpv[libmpv]
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/mpv[libmpv] x11-libs/libX11
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~yngwin/distfiles/baka-mplayer-2.0.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=56b78990483cea2d750909f1d48ad776
+_md5_=15d9c984e9ac853c50c0eece65ef6eef
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.6 b/metadata/md5-cache/media-video/ffmpeg-2.6
new file mode 100644
index 000000000000..6d8930ccf2af
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-2.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.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(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( >=virtual/pkgconfig-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(-)?] ) gnutls? ( >=virtual/pkgconfig-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(-)?] ) ieee1394? ( >=virtual/pkgconfig-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(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=virtual/pkgconfig-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(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) rtmp? ( >=virtual/pkgconfig-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(-)?] ) schroedinger? ( >=virtual/pkgconfig-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(-)?] ) test? ( net-misc/wget sys-devel/bc ) truetype? ( >=virtual/pkgconfig-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(-)?] ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
+EAPI=5
+HOMEPAGE=http://ffmpeg.org/
+IUSE=alsa +encode examples jack oss pic static-libs test v4l +bzip2 cpudetection debug doc gnutls +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi bs2b flite frei0r fribidi fontconfig ladspa libass truetype libsoxr +threads aac amrenc mp3 aacplus faac theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( aac? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.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(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) zvbi? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+SLOT=0/54.56.56
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.6.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=948909300b248186c1d2aac2b9a55801
diff --git a/metadata/md5-cache/media-video/parole-0.8.0 b/metadata/md5-cache/media-video/parole-0.8.0
new file mode 100644
index 000000000000..1a38ec0a9875
--- /dev/null
+++ b/metadata/md5-cache/media-video/parole-0.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.2:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0= >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= clutter? ( >=media-libs/clutter-1.16.4:1.0= >=media-libs/clutter-gtk-1.4.4:1.0= ) libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto >=sys-apps/sed-4
+DESCRIPTION=a simple media player based on the GStreamer framework for the Xfce4 desktop
+EAPI=5
+HOMEPAGE=http://goodies.xfce.org/projects/applications/parole/
+IUSE=clutter debug libnotify taglib
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= sys-apps/dbus:0= >=x11-libs/gtk+-3.2:3= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.11:0= >=xfce-base/libxfce4util-4.11:0= >=xfce-base/xfconf-4.10:0= clutter? ( >=media-libs/clutter-1.16.4:1.0= >=media-libs/clutter-gtk-1.4.4:1.0= ) libnotify? ( >=x11-libs/libnotify-0.7:0= ) taglib? ( >=media-libs/taglib-1.6:0= ) media-plugins/gst-plugins-meta:1.0
+SLOT=0
+SRC_URI=mirror://xfce/src/apps/parole/0.8/parole-0.8.0.tar.bz2
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_md5_=721e719e07f7664340cb7b31b6d0c3b8
diff --git a/metadata/md5-cache/net-libs/libircclient-1.8 b/metadata/md5-cache/net-libs/libircclient-1.8
index 971770d9e483..e51ed73f0927 100644
--- a/metadata/md5-cache/net-libs/libircclient-1.8
+++ b/metadata/md5-cache/net-libs/libircclient-1.8
@@ -4,10 +4,10 @@ DESCRIPTION=Small but powerful library implementing the client-server IRC protoc
 EAPI=5
 HOMEPAGE=http://www.ulduzsoft.com/libircclient/
 IUSE=doc ipv6 ssl static-libs threads
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2+
 RDEPEND=ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libircclient/libircclient-1.8.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=5d439f000ac78960d089ca5db43f718b
+_md5_=d8738c9752ac7087e6bd12132daeb8b9
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.03.03 b/metadata/md5-cache/net-misc/clusterssh-4.03.03
index 1bdf11dbdedb..fa825bce31f0 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.03.03
+++ b/metadata/md5-cache/net-misc/clusterssh-4.03.03
@@ -4,10 +4,10 @@ DESCRIPTION=Concurrent Multi-Server Terminal Access
 EAPI=5
 HOMEPAGE=http://clusterssh.sourceforge.net
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/perl-tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.01_05.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f4aef2718ca45aba203b0644e0ef7daa
+_md5_=dfda8d54a0cc460b22f39e8484aff7d6
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.1-r1 b/metadata/md5-cache/net-misc/pssh-2.3.1-r1
index e233755783d4..89386580f266 100644
--- a/metadata/md5-cache/net-misc/pssh-2.3.1-r1
+++ b/metadata/md5-cache/net-misc/pssh-2.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
 EAPI=5
 HOMEPAGE=http://code.google.com/p/parallel-ssh/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=net-misc/openssh !net-misc/putty >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://parallel-ssh.googlecode.com/files/pssh-2.3.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8a57fb06fac98626912a7468e98a72bd
+_md5_=2ae539914625e45cfddeaf0c0f19f118
diff --git a/metadata/md5-cache/net-misc/teamviewer-8.0.20931 b/metadata/md5-cache/net-misc/teamviewer-10.0.36281
similarity index 50%
rename from metadata/md5-cache/net-misc/teamviewer-8.0.20931
rename to metadata/md5-cache/net-misc/teamviewer-10.0.36281
index 6e9d10664da4..a6347192ba2b 100644
--- a/metadata/md5-cache/net-misc/teamviewer-8.0.20931
+++ b/metadata/md5-cache/net-misc/teamviewer-10.0.36281
@@ -4,11 +4,11 @@ DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
 EAPI=5
 HOMEPAGE=http://www.teamviewer.com
 IUSE=system-wine
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~*
 LICENSE=TeamViewer !system-wine? ( LGPL-2.1 )
-RDEPEND=app-shells/bash x11-misc/xdg-utils !system-wine? ( amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-soundlibs || ( ( >=x11-libs/libSM-1.2.1-r1[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXau-1.0.7-r1[abi_x86_32] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXfixes-5.0.1[abi_x86_32] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) x86? ( sys-libs/zlib x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst ) ) system-wine? ( app-emulation/wine )
+RDEPEND=app-shells/bash x11-misc/xdg-utils !system-wine? ( amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-soundlibs || ( ( x11-libs/libSM[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXau[abi_x86_32] x11-libs/libXdamage[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXfixes[abi_x86_32] x11-libs/libXtst[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) x86? ( sys-libs/zlib x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst ) ) system-wine? ( app-emulation/wine )
 RESTRICT=mirror
-SLOT=8
-SRC_URI=http://www.teamviewer.com/download/version_8x/teamviewer_linux.deb -> teamviewer-8.0.20931.deb
+SLOT=10
+SRC_URI=http://www.teamviewer.com/download/version_10x/teamviewer_linux.deb -> teamviewer-10.0.36281.deb
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=9e3af3a3795bf064538e9878c5d3c5a6
+_md5_=9e9f8786cb11827c9ac1f5354c3ad5d1
diff --git a/metadata/md5-cache/net-misc/teamviewer-7.0.9377 b/metadata/md5-cache/net-misc/teamviewer-7.0.9377
deleted file mode 100644
index 9d4c7425c9d9..000000000000
--- a/metadata/md5-cache/net-misc/teamviewer-7.0.9377
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
-EAPI=5
-HOMEPAGE=http://www.teamviewer.com
-IUSE=system-wine
-KEYWORDS=~amd64 ~x86
-LICENSE=TeamViewer !system-wine? ( LGPL-2.1 )
-RDEPEND=x11-misc/xdg-utils !system-wine? ( amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-soundlibs || ( ( >=x11-libs/libSM-1.2.1-r1[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXau-1.0.7-r1[abi_x86_32] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXfixes-5.0.1[abi_x86_32] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) x86? ( sys-libs/zlib x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst ) ) system-wine? ( app-emulation/wine )
-RESTRICT=mirror
-SLOT=7
-SRC_URI=http://download.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz -> teamviewer-7.0.9377.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8a8b507b3188e9d18c12f0002c359e03
diff --git a/metadata/md5-cache/net-misc/wget-1.16.3 b/metadata/md5-cache/net-misc/wget-1.16.3
new file mode 100644
index 000000000000..4388219cde93
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget-1.16.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup test
+DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Network utility to retrieve files from the WWW
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/wget/
+IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0 ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
+REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
+SLOT=0
+SRC_URI=mirror://gnu/wget/wget-1.16.3.tar.xz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=e62056767d4a7374c956239d2b1de976
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.03.09 b/metadata/md5-cache/net-misc/youtube-dl-2015.03.09
new file mode 100644
index 000000000000..5df3265734d2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.03.09
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)?] test? ( dev-python/nose[coverage(+)] ) 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)?]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=5
+HOMEPAGE=http://rg3.github.com/youtube-dl/
+IUSE=offensive test python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+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_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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2015.03.09/youtube-dl-2015.03.09.tar.gz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=7f74ebf35df4b4b1f026bd955c889f59
diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.66 b/metadata/md5-cache/net-print/cups-filters-1.0.66
index da49bec3f2fc..5067f7a4fba3 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.0.66
+++ b/metadata/md5-cache/net-print/cups-filters-1.0.66
@@ -4,10 +4,10 @@ DESCRIPTION=Cups PDF filters
 EAPI=5
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat
 IUSE=dbus +foomatic jpeg perl png static-libs tiff zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-9.09 app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2:= media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.66.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=fd6f91d2dddd3e224f8de05baa3a1e88
+_md5_=ea046a2e54995c8d78e62c53f95504ba
diff --git a/metadata/md5-cache/sci-biology/cutg-160-r1 b/metadata/md5-cache/sci-biology/cutg-160-r1
index 50178c85bbc7..86fa0ad8d0f8 100644
--- a/metadata/md5-cache/sci-biology/cutg-160-r1
+++ b/metadata/md5-cache/sci-biology/cutg-160-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Codon usage tables calculated from GenBank
 EAPI=5
 HOMEPAGE=http://www.kazusa.or.jp/codon/
 IUSE=emboss minimal
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
 RDEPEND=emboss? ( sci-biology/emboss )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/cutg-160.tar.xz
-_md5_=874d6a8f39907b8da4d5cc6e6e9735bd
+_md5_=e6723cb86e8b40b098fe785e67f1045f
diff --git a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11 b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11
index 8632d2ba5e57..6e5427dafa2b 100644
--- a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11
+++ b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r11
@@ -10,6 +10,6 @@ PDEPEND=sci-chemistry/pdb-extract sci-chemistry/pymol sci-chemistry/rasmol >=sci
 RDEPEND=>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/ssm virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) virtual/fortran =dev-lang/python-2*
 RESTRICT=mirror
 SLOT=0
-SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentooexperimental.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
+SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentoo.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e762e8200829f3bbefc1492d61bd9b1d
+_md5_=7ce96beaebe33372aedccad300cea74c
diff --git a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12 b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12
index 4f306a9f06ee..9ae6765fe892 100644
--- a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12
+++ b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r12
@@ -10,6 +10,6 @@ PDEPEND=sci-chemistry/pdb-extract sci-chemistry/pymol sci-chemistry/rasmol >=sci
 RDEPEND=>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/ssm virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) virtual/fortran =dev-lang/python-2*
 RESTRICT=mirror
 SLOT=0
-SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentooexperimental.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
+SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentoo.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d7f1cd1d9f1667d14f5b07f2f12d6976
+_md5_=cdbc81297e502e7b69deb14cbb60f435
diff --git a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r13 b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r13
index 4d84dcdc8900..1e18b98baaa2 100644
--- a/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r13
+++ b/metadata/md5-cache/sci-chemistry/ccp4-apps-6.1.3-r13
@@ -10,6 +10,6 @@ PDEPEND=sci-chemistry/pdb-extract sci-chemistry/pymol sci-chemistry/rasmol >=sci
 RDEPEND=>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/ssm virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) virtual/fortran
 RESTRICT=mirror
 SLOT=0
-SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentooexperimental.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
+SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentoo.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=a7a8990cb3cd6cd10ae0265a33daa270
+_md5_=9cb09975bd31857c5bdd6a4c8edbade6
diff --git a/metadata/md5-cache/sci-chemistry/ccp4i-6.1.3-r4 b/metadata/md5-cache/sci-chemistry/ccp4i-6.1.3-r4
new file mode 100644
index 000000000000..9c84660c983c
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/ccp4i-6.1.3-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=app-shells/tcsh media-gfx/graphviz >=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 sci-libs/ccp4-libs test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Protein X-ray crystallography toolkit -- graphical interface
+EAPI=5
+HOMEPAGE=http://www.ccp4.ac.uk/
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=ccp4
+RDEPEND=app-shells/tcsh media-gfx/graphviz >=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 sci-libs/ccp4-libs
+SLOT=0
+SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz mirror://gentoo/ccp4i-6.1.3-arpwarp.patch.bz2 http://dev.gentoo.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=a2796840af9342c1827f80bf9b6300d7
diff --git a/metadata/md5-cache/sci-chemistry/oasis-4.0-r2 b/metadata/md5-cache/sci-chemistry/oasis-4.0-r2
deleted file mode 100644
index c2fb3953f085..000000000000
--- a/metadata/md5-cache/sci-chemistry/oasis-4.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=!dev-ml/oasis sci-chemistry/ccp4-apps sci-chemistry/pymol sci-libs/mmdb sci-visualization/gnuplot !minimal? ( sci-chemistry/solve-resolve-bin sci-chemistry/arp-warp-bin ) sci-libs/ccp4-libs virtual/fortran
-DESCRIPTION=A direct-method program for SAD/SIR phasing
-EAPI=3
-HOMEPAGE=http://cryst.iphy.ac.cn/Project/protein/protein-I.html
-IUSE=examples +minimal
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=ccp4 oasis
-RDEPEND=!dev-ml/oasis sci-chemistry/ccp4-apps sci-chemistry/pymol sci-libs/mmdb sci-visualization/gnuplot !minimal? ( sci-chemistry/solve-resolve-bin sci-chemistry/arp-warp-bin ) virtual/fortran
-SLOT=0
-SRC_URI=http://dev.gentooexperimental.org/~jlec/distfiles/oasis4.0_Linux.zip
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6a45ed5f4e0689d2daa81b2cf8d70cbf
diff --git a/metadata/md5-cache/sci-chemistry/oasis-4.0-r3 b/metadata/md5-cache/sci-chemistry/oasis-4.0-r3
index 52e48a4c28ec..e725fbaa5ddb 100644
--- a/metadata/md5-cache/sci-chemistry/oasis-4.0-r3
+++ b/metadata/md5-cache/sci-chemistry/oasis-4.0-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=sci-chemistry/ccp4-apps sci-chemistry/pymol sci-libs/mmdb sci-visualization/gnuplot !minimal? ( sci-chemistry/solve-resolve-bin sci-chemistry/arp-warp-bin ) sci-libs/ccp4-libs virtual/fortran
+DEPEND=sci-chemistry/ccp4-apps sci-chemistry/pymol sci-libs/mmdb:0 sci-visualization/gnuplot !minimal? ( sci-chemistry/solve-resolve-bin sci-chemistry/arp-warp-bin ) sci-libs/ccp4-libs virtual/fortran
 DESCRIPTION=A direct-method program for SAD/SIR phasing
 EAPI=5
 HOMEPAGE=http://cryst.iphy.ac.cn/Project/protein/protein-I.html
 IUSE=examples +minimal
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=ccp4 oasis
-RDEPEND=sci-chemistry/ccp4-apps sci-chemistry/pymol sci-libs/mmdb sci-visualization/gnuplot !minimal? ( sci-chemistry/solve-resolve-bin sci-chemistry/arp-warp-bin ) virtual/fortran
+RDEPEND=sci-chemistry/ccp4-apps sci-chemistry/pymol sci-libs/mmdb:0 sci-visualization/gnuplot !minimal? ( sci-chemistry/solve-resolve-bin sci-chemistry/arp-warp-bin ) virtual/fortran
 SLOT=0
-SRC_URI=http://dev.gentooexperimental.org/~jlec/distfiles/oasis4.0_Linux.zip
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/oasis4.0_Linux.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0d1b7dfe0b75a72ab37b14e8610b28db
+_md5_=a2cb925de52c875c85d4ab33c6e15bd3
diff --git a/metadata/md5-cache/sci-libs/bliss-0.72 b/metadata/md5-cache/sci-libs/bliss-0.72
new file mode 100644
index 000000000000..0ae9bccd3a8c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/bliss-0.72
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gmp? ( dev-libs/gmp ) doc? ( app-doc/doxygen )
+DESCRIPTION=A Tool for Computing Automorphism Groups and Canonical Labelings of Graphs
+EAPI=5
+HOMEPAGE=http://www.tcs.hut.fi/Software/bliss/index.shtml
+IUSE=doc gmp static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gmp? ( dev-libs/gmp )
+SLOT=0
+SRC_URI=http://www.tcs.hut.fi/Software/bliss/bliss-0.72.zip
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=acc119a8a46845af2c33718e3dda259b
diff --git a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11 b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11
index 3fae26adf82b..28bd824ee3e9 100644
--- a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11
+++ b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r11
@@ -9,4 +9,4 @@ RDEPEND=!<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shell
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=0b6f5927e7c05961167b1947a7a68916
+_md5_=b25971d77daaeb0855b025cd478f7a1a
diff --git a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r12 b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r12
deleted file mode 100644
index 3c2ad82db254..000000000000
--- a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran sys-devel/gnuconfig
-DESCRIPTION=Protein X-ray crystallography toolkit - Libraries
-EAPI=5
-HOMEPAGE=http://www.ccp4.ac.uk/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=ccp4
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/fortran
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c4dc709f2b69fbdd5347caf9af8295a3
diff --git a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r13 b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r13
deleted file mode 100644
index 5efcb3913931..000000000000
--- a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran sys-devel/gnuconfig
-DESCRIPTION=Protein X-ray crystallography toolkit - Libraries
-EAPI=5
-HOMEPAGE=http://www.ccp4.ac.uk/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=ccp4
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/fortran
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=14b23c77484e4534861f5147c94ea2f3
diff --git a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r14 b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r14
deleted file mode 100644
index 9406f78660b9..000000000000
--- a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran sys-devel/gnuconfig
-DESCRIPTION=Protein X-ray crystallography toolkit - Libraries
-EAPI=5
-HOMEPAGE=http://www.ccp4.ac.uk/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=ccp4
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/fortran
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=610c5bfe88be4a9f0d453d64ad483869
diff --git a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r15 b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r15
index be991f3fa7bc..3ca1a6011020 100644
--- a/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r15
+++ b/metadata/md5-cache/sci-libs/ccp4-libs-6.1.3-r15
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran sys-devel/gnuconfig
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg:0= virtual/lapack virtual/blas virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran sys-devel/gnuconfig
 DESCRIPTION=Protein X-ray crystallography toolkit - Libraries
 EAPI=5
 HOMEPAGE=http://www.ccp4.ac.uk/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=ccp4
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg virtual/lapack virtual/blas virtual/fortran
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb:0 sci-libs/monomer-db sci-libs/ssm virtual/jpeg:0= virtual/lapack virtual/blas virtual/fortran
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e3689647d27afed33b4f7368c44379de
+_md5_=f4d9500668f055d5ec754986dc169447
diff --git a/metadata/md5-cache/sci-libs/exodusii-6.02 b/metadata/md5-cache/sci-libs/exodusii-6.02
index 86607feeff31..2278a65146ef 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.02
+++ b/metadata/md5-cache/sci-libs/exodusii-6.02
@@ -4,10 +4,10 @@ DESCRIPTION=Model developed to store and retrieve transient data for finite elem
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/exodusii/
 IUSE=static-libs test
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/netcdf[hdf5]
 SLOT=0
 SRC_URI=mirror://sourceforge/project/exodusii/exodus-6.02.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d9e0e12717f33c8c74eae899aa2800f5
+_md5_=f13655ff7f619cf80f158f79b1b6af89
diff --git a/metadata/md5-cache/sci-libs/monomer-db-0.090729 b/metadata/md5-cache/sci-libs/monomer-db-0.090729
index 728dabc1d944..5d164fd5c660 100644
--- a/metadata/md5-cache/sci-libs/monomer-db-0.090729
+++ b/metadata/md5-cache/sci-libs/monomer-db-0.090729
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
 DEPEND=!<sci-chemistry/ccp4-6.1.3
 DESCRIPTION=Monomer library used for macromolecular structure building and refinement
+EAPI=5
 HOMEPAGE=http://www.ccp4.ac.uk/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=ccp4
 RDEPEND=!<sci-chemistry/ccp4-6.1.3
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=http://dev.gentooexperimental.org/~jlec/science-dist/monomer-db-0.090729.tar.gz
-_md5_=e6aca33b6cb03600803a8e00927d6b0d
+SRC_URI=http://dev.gentoo.org/~jlec/science-dist/monomer-db-0.090729.tar.gz
+_md5_=daa658dd59c115e5895a5f9f01b71ef8
diff --git a/metadata/md5-cache/sci-libs/vtk-6.1.0-r1 b/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
index 8e6c00db0b45..86a087bc3cdf 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Visualization Toolkit
 EAPI=5
 HOMEPAGE=http://www.vtk.org/
 IUSE=all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl video_cards_nvidia views web xdmf2 R +X elibc_FreeBSD java python_targets_python2_7 test
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
 RDEPEND=dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0 media-libs/mesa media-libs/libtheora media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( >=dev-libs/boost-1.40.0[mpi?] ) cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( dev-qt/qtcore:4 dev-qt/qtgui:4 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jre-1.5:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] ) ) qt4? ( dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 python? ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] ) ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) video_cards_nvidia? ( media-video/nvidia-settings ) web? ( >=app-admin/webapp-config-1.50.15 python? ( dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] ) ) xdmf2? ( sci-libs/xdmf2 ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt4 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) smp? ( ^^ ( kaapi tbb ) ) test? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.1/VTK-6.1.0.tar.gz doc? ( http://www.vtk.org/files/release/6.1/vtkDocHtml-6.1.0.tar.gz ) test? ( http://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz http://www.vtk.org/files/release/6.1/VTKLargeData-6.1.0.tar.gz )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=aa3d1c2cbb3827d92900714841fb7873
+_md5_=e46bc7be41419480178477982eedb887
diff --git a/metadata/md5-cache/sci-libs/vtkdata-6.1.0 b/metadata/md5-cache/sci-libs/vtkdata-6.1.0
index b48e9c1d6113..58c9925697af 100644
--- a/metadata/md5-cache/sci-libs/vtkdata-6.1.0
+++ b/metadata/md5-cache/sci-libs/vtkdata-6.1.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Example data file for VTK
 EAPI=5
 HOMEPAGE=http://www.vtk.org
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!<sci-libs/vtk-6
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cf69d849c5f9ab1f28a048e147a48638
+_md5_=a25aad523f0db98761696daefa106aa8
diff --git a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1 b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1
index 975ee462dd1f..60774207e4b3 100644
--- a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1
+++ b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r1
@@ -4,10 +4,10 @@ DESCRIPTION=eXtensible Data Model and Format
 EAPI=5
 HOMEPAGE=http://xdmf.org/index.php/Main_Page
 IUSE=doc python test python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=VTK
 RDEPEND=sci-libs/hdf5:= dev-libs/libxml2:2 python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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_python2_7(+)] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/xdmf2-1.0_p141226.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=08c85fc23ef8e226692feb564838f040
+_md5_=b33cec9b2087230d5228f5bf1071a7ce
diff --git a/metadata/md5-cache/sci-libs/xkaapi-2.2 b/metadata/md5-cache/sci-libs/xkaapi-2.2
index b22e41a777a1..4ad6c000cffb 100644
--- a/metadata/md5-cache/sci-libs/xkaapi-2.2
+++ b/metadata/md5-cache/sci-libs/xkaapi-2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel for Adaptative, Asynchronous Parallel and Interactive program
 EAPI=5
 HOMEPAGE=http://kaapi.gforge.inria.fr
 IUSE=blas cxx fortran gpu openmp static-libs
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
 RDEPEND=sys-apps/hwloc virtual/libffi fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/33666/xkaapi-2.2.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e27dfe8b1d2fb96aad3a5ddf49190aa5
+_md5_=642acb8362a560a5ec1bf28bc673f272
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.5.9 b/metadata/md5-cache/sci-mathematics/nauty-2.5.9
new file mode 100644
index 000000000000..34032a0940af
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.5.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare test
+DESCRIPTION=Computing automorphism groups of graphs and digraphs
+EAPI=5
+HOMEPAGE=http://pallini.di.uniroma1.it/
+KEYWORDS=~amd64 ~x86
+LICENSE=nauty
+SLOT=0
+SRC_URI=http://cs.anu.edu.au/~bdm/nauty/nauty25r9.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4278dba3bb15fc3979aa0ce0aebe817e
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-2.12.2 b/metadata/md5-cache/sci-mathematics/normaliz-2.12.2
index c61561bf21f0..5c8b664dfb40 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-2.12.2
+++ b/metadata/md5-cache/sci-mathematics/normaliz-2.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=5
 HOMEPAGE=http://www.mathematik.uni-osnabrueck.de/normaliz/
 IUSE=doc extras openmp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gmp[cxx]
 SLOT=0
 SRC_URI=http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.12.2/Normaliz2.12.2.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=41cb592fb1c5985fcb8a75da43bc4f44
+_md5_=fd8c90351f7ede83c093fd129efcddf1
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.2 b/metadata/md5-cache/sci-mathematics/singular-4.0.2
new file mode 100644
index 000000000000..889235299f5d
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure postinst postrm prepare setup
+DEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) sci-mathematics/flint sci-mathematics/4ti2 dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Computer algebra system for polynomial computations
+EAPI=5
+HOMEPAGE=http://www.singular.uni-kl.de/
+IUSE=boost doc emacs examples python +readline
+KEYWORDS=~amd64 ~x86 ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) sci-mathematics/flint sci-mathematics/4ti2
+SLOT=0
+SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2-share.tar.gz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3b6577dec0220cf555792aa9f560bd48
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.4-r1 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.4-r1
new file mode 100644
index 000000000000..2c23fc73eacd
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=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(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam[abi_x86_32(-)?,abi_x86_64(-)?,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-auth/nss_ldap !sys-auth/pam_ldap
+DESCRIPTION=NSS module for name lookups using LDAP
+EAPI=5
+HOMEPAGE=http://arthurdejong.org/nss-pam-ldapd/
+IUSE=debug kerberos sasl +pam abi_x86_32 abi_x86_64 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=LGPL-2.1
+RDEPEND=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(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam[abi_x86_32(-)?,abi_x86_64(-)?,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-auth/nss_ldap !sys-auth/pam_ldap
+SLOT=0
+SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.4.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=4b2193f659856b9c7a0130559bf71632
diff --git a/metadata/md5-cache/sys-block/fio-1.17 b/metadata/md5-cache/sys-block/fio-1.17
deleted file mode 100644
index d4dfd27aef47..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.17.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=eb8646285632ebdb1553698ae00b141b
diff --git a/metadata/md5-cache/sys-block/fio-1.18.1 b/metadata/md5-cache/sys-block/fio-1.18.1
deleted file mode 100644
index bede6be67854..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.18.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.18.1.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c8682826fbb99f12a8409b15c8cc79b8
diff --git a/metadata/md5-cache/sys-block/fio-1.20 b/metadata/md5-cache/sys-block/fio-1.20
deleted file mode 100644
index c0bac1a0fde1..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.20.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d2f146fc933a3a287ca5f01e8c09f145
diff --git a/metadata/md5-cache/sys-block/fio-1.21 b/metadata/md5-cache/sys-block/fio-1.21
deleted file mode 100644
index 0fc62fdb9ec5..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.21.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3f283551b81fff24c04552dc15b1505a
diff --git a/metadata/md5-cache/sys-block/fio-1.21_rc3 b/metadata/md5-cache/sys-block/fio-1.21_rc3
deleted file mode 100644
index 89d5529b0830..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.21_rc3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.21-rc3.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ab75c363eea4a6916784436c405c610f
diff --git a/metadata/md5-cache/sys-block/fio-1.22 b/metadata/md5-cache/sys-block/fio-1.22
deleted file mode 100644
index 90e0e06a3296..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.22.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bcd370d3a9dc7b827dca3ffb43701250
diff --git a/metadata/md5-cache/sys-block/fio-1.23 b/metadata/md5-cache/sys-block/fio-1.23
deleted file mode 100644
index 7c0992f710b7..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.23.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6113d3e3fcc8cd8b103bdc4087cdd574
diff --git a/metadata/md5-cache/sys-block/fio-1.25.1 b/metadata/md5-cache/sys-block/fio-1.25.1
deleted file mode 100644
index cc3a12ac2266..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.25.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.25.1.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d17450bb4d5d759f2fd49189fc26e27f
diff --git a/metadata/md5-cache/sys-block/fio-1.34 b/metadata/md5-cache/sys-block/fio-1.34
deleted file mode 100644
index 196014f780da..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.34
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=2
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.34.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=2167b451390062a52cba245a35d6cdb5
diff --git a/metadata/md5-cache/sys-block/fio-1.50_rc4 b/metadata/md5-cache/sys-block/fio-1.50_rc4
deleted file mode 100644
index e87950be1a95..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.50_rc4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=2
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.50-rc4.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4f093ba2e25b708bf209c786ae4dc70b
diff --git a/metadata/md5-cache/sys-block/fio-1.58 b/metadata/md5-cache/sys-block/fio-1.58
deleted file mode 100644
index 9b0b3d05395f..000000000000
--- a/metadata/md5-cache/sys-block/fio-1.58
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=2
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-1.58.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4a3823cc822024b0bcc87c5cfa38e07c
diff --git a/metadata/md5-cache/sys-block/fio-2.0.10 b/metadata/md5-cache/sys-block/fio-2.0.10
deleted file mode 100644
index 72687016dc25..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=4
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.10.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=e70a3a76e8d8aa674cf603c3addb07f6
diff --git a/metadata/md5-cache/sys-block/fio-2.0.13 b/metadata/md5-cache/sys-block/fio-2.0.13
deleted file mode 100644
index 3610e64ac10b..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=4
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.13.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=9ad5cfbd1be6b3faab4fdc68255c27af
diff --git a/metadata/md5-cache/sys-block/fio-2.0.14 b/metadata/md5-cache/sys-block/fio-2.0.14
deleted file mode 100644
index 65f16e388cd7..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=4
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.14.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=1324a2865f39222bda7aa4e4c217e465
diff --git a/metadata/md5-cache/sys-block/fio-2.0.3 b/metadata/md5-cache/sys-block/fio-2.0.3
deleted file mode 100644
index ad7fa44974d7..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=2
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.3.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=7b0b714c57b1eb108ca0d97dac8d0470
diff --git a/metadata/md5-cache/sys-block/fio-2.0.8 b/metadata/md5-cache/sys-block/fio-2.0.8
deleted file mode 100644
index 68aff07b6985..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=4
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.8.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f710008f5e7b8dec7e47e3cdf81bee50
diff --git a/metadata/md5-cache/sys-block/fio-2.0.9 b/metadata/md5-cache/sys-block/fio-2.0.9
deleted file mode 100644
index b09127847c3e..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libaio
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=4
-HOMEPAGE=http://brick.kernel.dk/snaps/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.9.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=8fc70b0a336c63c0bcebc0f2f948504c
diff --git a/metadata/md5-cache/sys-block/fio-2.1.10 b/metadata/md5-cache/sys-block/fio-2.1.10
deleted file mode 100644
index 9ee6755f30ed..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio gnuplot gtk numa zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.10.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=15003aea95aee49939d1cb7f49d77889
diff --git a/metadata/md5-cache/sys-block/fio-2.1.10-r1 b/metadata/md5-cache/sys-block/fio-2.1.10-r1
deleted file mode 100644
index 86b76d793521..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio gnuplot gtk numa zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.10.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d4bbe5bd3e464faedbe8dfaab51522c2
diff --git a/metadata/md5-cache/sys-block/fio-2.1.11 b/metadata/md5-cache/sys-block/fio-2.1.11
deleted file mode 100644
index 8c83a468ea5e..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio gnuplot gtk numa zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.11.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c2308ad0adb29f742da0895a17f6b49c
diff --git a/metadata/md5-cache/sys-block/fio-2.1.11-r1 b/metadata/md5-cache/sys-block/fio-2.1.11-r1
deleted file mode 100644
index 8b227f4c8e69..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio glusterfs gnuplot gtk numa rbd zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.11.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=4b909269aad6b73fef4dde14d62ca7b4
diff --git a/metadata/md5-cache/sys-block/fio-2.1.14 b/metadata/md5-cache/sys-block/fio-2.1.14
deleted file mode 100644
index af8448a44691..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio glusterfs gnuplot gtk numa rbd zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.14.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=611b2d4072df57bb138eeeb7ddc1abb5
diff --git a/metadata/md5-cache/sys-block/fio-2.1.2 b/metadata/md5-cache/sys-block/fio-2.1.2
deleted file mode 100644
index 90e980a7c7d0..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=gtk python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.2.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=52b9e4b35fd39f94f1a593f41fcb8d54
diff --git a/metadata/md5-cache/sys-block/fio-2.1.4 b/metadata/md5-cache/sys-block/fio-2.1.4
deleted file mode 100644
index 91b331e4d10f..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=gtk python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.4.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c5093eb5b87d31814a07360fe8347fd4
diff --git a/metadata/md5-cache/sys-block/fio-2.1.5 b/metadata/md5-cache/sys-block/fio-2.1.5
deleted file mode 100644
index 014b4931ee46..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=gtk python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.5.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=3810ce8ab3fe6160323241c6688c36b0
diff --git a/metadata/md5-cache/sys-block/fio-2.1.6.1 b/metadata/md5-cache/sys-block/fio-2.1.6.1
deleted file mode 100644
index 862c87381b97..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=gtk python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.6.1.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=6cfa527e844937cc1e41892d9904c367
diff --git a/metadata/md5-cache/sys-block/fio-2.1.7 b/metadata/md5-cache/sys-block/fio-2.1.7
deleted file mode 100644
index 5288cf91bda2..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=gtk python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.7.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=bc9be0e0fddc00ae3d918449cf297846
diff --git a/metadata/md5-cache/sys-block/fio-2.1.8 b/metadata/md5-cache/sys-block/fio-2.1.8
deleted file mode 100644
index 5fc90fb45b52..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=gtk python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio gtk? ( x11-libs/gtk+:2 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.8.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ed4a667fd17c91f511c470ee461a780c
diff --git a/metadata/md5-cache/sys-block/fio-2.1.8-r1 b/metadata/md5-cache/sys-block/fio-2.1.8-r1
deleted file mode 100644
index 26a15b7fecca..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.1.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio gnuplot gtk numa zlib python_targets_python2_7
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.8.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=88ed7a67715b940b783f4755c25d084f
diff --git a/metadata/md5-cache/sys-block/fio-2.2.4 b/metadata/md5-cache/sys-block/fio-2.2.4
deleted file mode 100644
index 6774933827d0..000000000000
--- a/metadata/md5-cache/sys-block/fio-2.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio glusterfs gnuplot gtk numa rbd zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.2.4.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=ae9f821a8e7d12a0bee565e736640bac
diff --git a/metadata/md5-cache/sys-block/fio-2.2.4-r1 b/metadata/md5-cache/sys-block/fio-2.2.4-r1
new file mode 100644
index 000000000000..64f9c8c6c5a0
--- /dev/null
+++ b/metadata/md5-cache/sys-block/fio-2.2.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=aio? ( dev-libs/libaio ) glusterfs? ( !arm? ( sys-cluster/glusterfs ) ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( !arm? ( sys-process/numactl ) ) rbd? ( !arm? ( !ppc? ( sys-cluster/ceph ) ) ) rdma? ( !ppc? ( !ppc64? ( !ia64? ( !arm? ( sys-infiniband/librdmacm ) ) ) ) ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Jens Axboe's Flexible IO tester
+EAPI=5
+HOMEPAGE=http://brick.kernel.dk/snaps/
+IUSE=aio glusterfs gnuplot gtk numa rbd rdma zlib python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=aio? ( dev-libs/libaio ) glusterfs? ( !arm? ( sys-cluster/glusterfs ) ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( !arm? ( sys-process/numactl ) ) rbd? ( !arm? ( !ppc? ( sys-cluster/ceph ) ) ) rdma? ( !ppc? ( !ppc64? ( !ia64? ( !arm? ( sys-infiniband/librdmacm ) ) ) ) ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot 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(-)] )
+SLOT=0
+SRC_URI=http://brick.kernel.dk/snaps/fio-2.2.4.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=797a2f23c127b038649b85e317306863
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20150309 b/metadata/md5-cache/sys-fs/aufs3-3_p20150309
new file mode 100644
index 000000000000..2f39e2a32c20
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20150309
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=An entirely re-designed and re-implemented Unionfs
+EAPI=5
+HOMEPAGE=http://aufs.sourceforge.net/
+IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20150309.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7326f3b4e194de12870dda8fc9e0685f
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.3 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3
index 68b44e690f0a..1a2dd975fe46 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.3
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for creating compressed filesystem type squashfs
 EAPI=5
 HOMEPAGE=http://squashfs.sourceforge.net
 IUSE=+xz lzma lz4 lzo xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=21b428bcc37a986e82dbb0d5675f3a1d
+_md5_=025f3c45db40e8505aa0fc97fc0625a9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.32 b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.35
similarity index 83%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.14.32
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.14.35
index c3e9c05dbd52..43d472aebedf 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.32
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.35
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.32
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14.21+_p20150126.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-37.base.tar.xz mirror://gentoo/genpatches-3.14-37.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-37.experimental.tar.xz ) )
+SLOT=3.14.35
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14.21+_p20150309.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-40.base.tar.xz mirror://gentoo/genpatches-3.14-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-40.experimental.tar.xz ) )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	kernel-2	1616028b220da4e6b0c6d5330390602c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d47d7c6f7d39bc70cc8778e0f524efcd
+_md5_=c61ffe7ee0678b27a6aacfe234bcabde
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.6-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.9
similarity index 83%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.18.6-r1
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.18.9
index e37f62368afd..c340086b714a 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.6-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.9
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.18.6-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-3.18 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20150126.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-8.base.tar.xz mirror://gentoo/genpatches-3.18-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-8.experimental.tar.xz ) )
+SLOT=3.18.9
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-3.18 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20150309.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-11.base.tar.xz mirror://gentoo/genpatches-3.18-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-11.experimental.tar.xz ) )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	kernel-2	1616028b220da4e6b0c6d5330390602c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f3540b2cb0ee589004f58b0059188437
+_md5_=2c79ca03f4fdacdaa741ef8d3383e1f9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.7-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-3.19.1
similarity index 65%
rename from metadata/md5-cache/sys-kernel/aufs-sources-3.18.7-r1
rename to metadata/md5-cache/sys-kernel/aufs-sources-3.19.1
index 4ce46ce49ad5..1a67bbdfc2e3 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.7-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.19.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree and aufs3 support
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.19 kernel tree and aufs3 support
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=deblob experimental module vanilla symlink build deblob
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.18.7-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-3.18 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20150126.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-9.base.tar.xz mirror://gentoo/genpatches-3.18-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-9.experimental.tar.xz ) )
+SLOT=3.19.1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.19.N/deblob-3.19 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.19.N/deblob-check -> deblob-check-3.19 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.19_p20150309.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.19-2.base.tar.xz mirror://gentoo/genpatches-3.19-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.19-2.experimental.tar.xz ) )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	kernel-2	1616028b220da4e6b0c6d5330390602c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=008f7266211398c3a0421e70536f9717
+_md5_=d15c275071adabb85b35f6e551699035
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.0_rc3 b/metadata/md5-cache/sys-kernel/git-sources-4.0_rc3
new file mode 100644
index 000000000000..dbe44b6dfb1b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.0_rc3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.0_rc3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.0-rc3.xz mirror://kernel/linux/kernel/v4.x/linux-3.19.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	kernel-2	1616028b220da4e6b0c6d5330390602c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=60372e91f6b991b474e200f65b7f7cdd
diff --git a/metadata/md5-cache/virtual/python-futures-0 b/metadata/md5-cache/virtual/python-futures-0
index 1ff8cd9881a6..98f0361cf68c 100644
--- a/metadata/md5-cache/virtual/python-futures-0
+++ b/metadata/md5-cache/virtual/python-futures-0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for the Python concurrent.futures module
 EAPI=5
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] )
 SLOT=0
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=f52a6b36c22c46e7e0f3f40930b3732d
+_md5_=10a4a4cc51515240cad4b60da9667e36
diff --git a/metadata/md5-cache/www-apps/owncloud-8.0.0 b/metadata/md5-cache/www-apps/owncloud-8.0.0
index 8a0854a8b5d8..4ea46d846d10 100644
--- a/metadata/md5-cache/www-apps/owncloud-8.0.0
+++ b/metadata/md5-cache/www-apps/owncloud-8.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=8.0.0
 SRC_URI=http://download.owncloud.org/community/owncloud-8.0.0.tar.bz2 -> owncloud-8.0.0.tar.bz2
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=24fa5a87ae945e76d462fb66548a4bb4
+_md5_=cb02dce08a4255b1b12ae58503a9b8de
diff --git a/metadata/md5-cache/www-client/phantomjs-1.9.8 b/metadata/md5-cache/www-client/phantomjs-1.9.8
index 16d643f8f74e..1a6718ce92fb 100644
--- a/metadata/md5-cache/www-client/phantomjs-1.9.8
+++ b/metadata/md5-cache/www-client/phantomjs-1.9.8
@@ -4,10 +4,10 @@ DESCRIPTION=A headless WebKit scriptable with a JavaScript API
 EAPI=5
 HOMEPAGE=http://phantomjs.org/
 IUSE=examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/icu:= dev-libs/openssl media-libs/fontconfig media-libs/freetype media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10
 SLOT=0
 SRC_URI=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-source.zip
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=de1e400847e4d8f71f2c65fb8cee0430
+_md5_=f099b2daf26cafbb7572fe673a895750
diff --git a/metadata/md5-cache/www-servers/tornado-3.1.1-r1 b/metadata/md5-cache/www-servers/tornado-3.1.1-r1
index de5a7b790505..1117fdfae75c 100644
--- a/metadata/md5-cache/www-servers/tornado-3.1.1-r1
+++ b/metadata/md5-cache/www-servers/tornado-3.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl[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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=curl? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-3.1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	331701099758706863819fe3ff6ddc8a	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=817513476a44eb1cdc36c4a3e0bdd475
+_md5_=537b4abdc4043406da177bf42f5bef81
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0 b/metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0
index 7ba703739888..2e6598383cfd 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[video_cards_tegra] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DEPEND=x11-libs/libdrm[video_cards_tegra] >=x11-base/xorg-server-1.13 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
 DESCRIPTION=X.Org video driver for NVIDIA Tegra
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 KEYWORDS=~arm
 LICENSE=MIT
-RDEPEND=x11-libs/libdrm[video_cards_tegra] x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
+RDEPEND=x11-libs/libdrm[video_cards_tegra] >=x11-base/xorg-server-1.13 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-opentegra-0.7.0.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=bcd18fbac9670160cd30d03bfbc33114
+_md5_=c460fd51c63a0b7885a362f0b00cfc26
diff --git a/metadata/md5-cache/x11-misc/synergy-1.7.0 b/metadata/md5-cache/x11-misc/synergy-1.7.0
new file mode 100644
index 000000000000..e34ab824e724
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/synergy-1.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/crypto++-5.6.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat] ) test? ( >=dev-cpp/gmock-1.6.0 ) x11-proto/kbproto x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple computers
+EAPI=5
+HOMEPAGE=http://synergy-project.org/ https://github.com/synergy/synergy
+IUSE=qt4 test
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/crypto++-5.6.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat] ) qt4? ( !x11-misc/qsynergy )
+SLOT=0
+SRC_URI=https://github.com/synergy/synergy/archive/1.7.0.tar.gz -> synergy-1.7.0.tar.gz http://dev.gentoo.org/~hasufell/distfiles/synergy.png
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=0296ed179811f78a664c41f58a010b5d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5a5abd67bd31..794e4ca9e285 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 21:36:56 +0000
+Mon, 09 Mar 2015 19:06:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 674622f99c33..07aaaaaeb739 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Mar  8 21:36:53 UTC 2015
+Mon Mar  9 19:06:51 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 52814639a8c4..8915189ea0e0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 22:00:01 +0000
+Mon, 09 Mar 2015 19:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e6f320e41daa..cf53f7792f17 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1425850501 Sun 08 Mar 2015 09:35:01 PM UTC UTC
+1425927901 Mon 09 Mar 2015 07:05:01 PM UTC UTC
diff --git a/net-libs/libircclient/libircclient-1.8.ebuild b/net-libs/libircclient/libircclient-1.8.ebuild
index 36b5efafccfa..83dc58d61d05 100644
--- a/net-libs/libircclient/libircclient-1.8.ebuild
+++ b/net-libs/libircclient/libircclient-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.8.ebuild,v 1.2 2015/03/08 06:29:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.8.ebuild,v 1.3 2015/03/09 11:44:31 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc ipv6 ssl static-libs threads"
 
 DEPEND="ssl? ( dev-libs/openssl:0 )"
diff --git a/net-misc/clusterssh/clusterssh-4.03.03.ebuild b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
index 3ac55d6007d0..beded0201045 100644
--- a/net-misc/clusterssh/clusterssh-4.03.03.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clusterssh/clusterssh-4.03.03.ebuild,v 1.1 2014/12/11 14:32:13 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clusterssh/clusterssh-4.03.03.ebuild,v 1.2 2015/03/09 11:45:01 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://clusterssh.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-misc/pssh/pssh-2.3.1-r1.ebuild b/net-misc/pssh/pssh-2.3.1-r1.ebuild
index 40b51f5f87bf..e2dba02ec607 100644
--- a/net-misc/pssh/pssh-2.3.1-r1.ebuild
+++ b/net-misc/pssh/pssh-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.3.1-r1.ebuild,v 1.1 2015/03/08 20:20:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.3.1-r1.ebuild,v 1.2 2015/03/09 11:44:21 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://parallel-ssh.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="net-misc/openssh
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index f1321acd5e51..d96e997c63b5 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,4 +1,3 @@
-DIST teamviewer-7.0.9377.tar.gz 18102617 SHA256 3eaa78cbbd49449f2dbe5be6f0af99535a039598867a537ea8230189251909b9 SHA512 cc959dc9d243be499dbd5781c979305787659fbc95f72f5cb5e05dc042006cf05e670e8feb88322a1adf74f1c58cdf8883c11945a5baff26b0a7a2a4e8b08a8b WHIRLPOOL 68cc97298d8f98b5021e39954f45167eb2b32ff3bd32aa38733120574dafcf13884e452823ccec9d73f3244989433919395ba6d357f714635a1a6276bd8fa855
-DIST teamviewer-8.0.20931.deb 19567090 SHA256 6ad27b106a125c51075597c526b7b84fa9637af1aef6ee0514faa49694bf70dd SHA512 991fb4e572b312289097062577c9dfd9189d8405902e6965b224b1ad7e883de2dca99aa18b4ae2e333ce1cab65eade0f86eddccc32ed045140a34037c1a129d0 WHIRLPOOL e7ec1544e13b6cdc161783e36589b1cf07bbe60dd32f811d29e8c7b266477840550a08382c3b4683fbf00a6433305c135714bb30fb260c202a1bb828f0da8d45
+DIST teamviewer-10.0.36281.deb 43331378 SHA256 f3eb252785d04105d066beeb498fad62c995f67456e52d5213b86766d232cb75 SHA512 39bb933ded0f23e86dd0f757b1b2c904c441a70b3b1470b3cf98bf3204a50e81145cf1c70677550376c6fe91509f9d2adca1857f64d499e7240e74f1a7387a55 WHIRLPOOL 4274fd03946b755860a153169b651360c0f11244c4076e9a032b109d88753957b626234dd3860b6e28a96db543be59db76f2bb53f8222e58a89fba1a7d99a803
 DIST teamviewer-9.0.30203.deb 23460204 SHA256 ef01b63eeec7aa9c046b613d26448b87f6bd00774941730fd26f60bb14f5aa75 SHA512 ead3467bbfb7b29c6c83218271afb9d4a8ac740eaba0d879ec1fe2501199d98b6bb9549a9238153680f978439519fcbd6e85744bdf375a1296c56bb9d13407d9 WHIRLPOOL edc23b23b2ee4961b9d92748460236bb94373b8320c67b1f4ef4055874dbe8d596409dd206ea32c6a20cf593c579943ec8c2f047b01b858ccd50616d49965320
 DIST teamviewer-9.0.32150.deb 22898922 SHA256 66d9a69f7e1523a2e1b41ff2e55adac01b2dae9b8bdfabf9db6080fc21d24451 SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d WHIRLPOOL fa48ff99a5df29072b1073f35e3f27aeba87b2b846813dca612212344a5b8e35f7f1e221e1fb4f7a12464fce4a185b8dad6dd8f48432e4c48ecd61d9cc6b7960
diff --git a/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch b/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch
new file mode 100644
index 000000000000..b3243908eb96
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch
@@ -0,0 +1,150 @@
+diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/script/tvw_extra
+index 71164aa..848cd25 100644
+--- a/opt/teamviewer9/tv_bin/script/tvw_extra
++++ b/opt/teamviewer9/tv_bin/script/tvw_extra
+@@ -16,13 +16,6 @@
+   isInstalledTV || return
+   ABecho "teamviewer --passwd [PASSWD]"	"set a password (useful when installing remote (ssh)"
+   echo
+-  ABecho "teamviewer --daemon status"	"show current status of the TeamViewer daemon"
+-  ABecho "teamviewer --daemon start"	"start		TeamViewer daemon"
+-  ABecho "teamviewer --daemon stop"		"stop		TeamViewer daemon"
+-  ABecho "teamviewer --daemon restart"	"stop/start	TeamViewer daemon"
+-  ABecho "teamviewer --daemon disable"	"disable	TeamViewer daemon - don't start daemon on system startup"
+-  ABecho "teamviewer --daemon enable"	"enable		TeamViewer daemon - start daemon on system startup (default)"
+-  echo
+ }
+ 
+ function PrintVersion()
+@@ -37,19 +30,6 @@
+   PrintDaemonStatus
+   echo
+   PrintTeamViewerID
+-}
+-
+-function PrintDaemonStatus()
+-{
+-  local cmd="$(daemonCtl 'status')"
+-  local txt="n/a"
+-
+-  if [ isInstalledTV ] ; then
+-    txt="$(eval "$cmd")"
+-    [ $? = 0 ] || txt='n/a (error)'
+-  fi
+-  
+-  ABecho "teamviewerd status" "$txt"
+ }
+ 
+ function PrintTeamViewerID()
+@@ -64,20 +44,21 @@
+   ABecho "TeamViewer ID:" "$tvid"
+ 
+   if [ -z "$tvid" ] && isInstalledTV; then
+-    echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)"
++    echo "Try restarting the TeamViewer daemon."
+   fi
+ }
+ 
+ function SetPasswd()
+ {
++  echo "Stop your teamviewer daemon first, then press enter."
++  read
++
+   local pwd="$1"
+   [ -n "$pwd" ] || die 'no password specified'
+ 
+   installedTVorDie
+   isSuperUser || die 'You need root permissions for this operation'
+ 
+-  Run_Daemon 'stop' > /dev/null
+-  
+   "$TV_BIN_DIR/teamviewerd" --passwd "$pwd"
+   case $? in
+     0  ) echo 'ok'	;;
+@@ -88,12 +69,14 @@
+     *  ) echo 'unknown response'	;;
+    esac
+   
+-  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
+-  echo
++  echo "You may start your teamviewer daemon again."
+ }
+ 
+ function ExportLicense()
+ {
++  echo "Stop your teamviewer daemon first, then press enter."
++  read
++
+   local license="$1"
+   local path='/tmp/tv_global.conf'
+ 
+@@ -101,8 +84,6 @@
+ 
+   isSuperUser || die 'You need root permissions for this operation'
+ 
+-  Run_Daemon 'stop' > /dev/null
+-  
+   "$TV_BIN_DIR/teamviewerd" --export-license "$license" "$path"
+   case $? in
+     0  ) echo "ok - license exported to '$path'"		;;
+@@ -110,8 +91,7 @@
+     *  ) echo 'unknown response'	;;
+    esac
+   
+-  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
+-  echo
++  echo "You may start your teamviewer daemon again."
+ }
+ 
+ function StripPersonalInformation()
+diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/script/tvw_main
+index 8984db0..c6dff8d 100644
+--- a/opt/teamviewer9/tv_bin/script/tvw_main
++++ b/opt/teamviewer9/tv_bin/script/tvw_main
+@@ -4,7 +4,6 @@
+ source "$TV_SCRIPT_DIR/tvw_config"
+ source "$TV_SCRIPT_DIR/tvw_exec"
+ source "$TV_SCRIPT_DIR/tvw_extra"
+-source "$TV_SCRIPT_DIR/tvw_daemon"
+ source "$TV_SCRIPT_DIR/tvw_profile"
+ 
+ function Main()
+@@ -18,7 +17,6 @@
+     --help )			PrintHelp				;;
+     --version )			PrintVersion			;;
+     --info )			PrintInfo				;;
+-    --daemon )			Run_Daemon $opt			;;
+     --winecfg )	shift;	Run_WineCfg "$@"		;;
+     --regedit )	shift;	Run_RegEdit "$@"		;;
+     --kill )			Run_KillTeamViewer		;;
+@@ -170,18 +168,3 @@
+   Init
+   wine regedit "$@"
+ }
+-
+-function Run_Daemon()
+-{
+-  local opt="$1"
+-  
+-  installedTVorDie
+-
+-  case "$opt" in
+-    ( disable )					removeDaemon	|| rootSuggest	;;
+-    ( enable  )					installDaemon	|| rootSuggest	;;
+-    ( start | stop | restart )	cmdDaemon $opt	|| rootSuggest	;;
+-    ( status )					cmdDaemon $opt					;;
+-    ( * )						echo "unknown option '$opt'"	;;
+-  esac
+-}
+--- /opt/teamviewer10/tv_bin/script/teamviewerd.service	2015-01-15 12:55:57.000000000 -0500
++++ /opt/teamviewer10/tv_bin/script/teamviewerd.service	2015-03-08 19:00:17.297108541 -0400
+@@ -6,7 +6,7 @@
+ [Service]
+ Type = forking
+ PIDFile = /var/run/teamviewerd.pid
+-ExecStart = /opt/teamviewer/tv_bin/teamviewerd -d
++ExecStart = /opt/teamviewer10/tv_bin/teamviewerd -d
+ Restart = on-abort
+ StartLimitInterval = 60
+ StartLimitBurst = 10
+
diff --git a/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch b/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch
deleted file mode 100644
index ebbe5cd71894..000000000000
--- a/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Feb 19 21:24:39 UTC 2013
-Subject: make scripts POSIX compliant
-
---- teamviewer7/.tvscript/.regedit
-+++ teamviewer7/.tvscript/.regedit
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine regedit "$@"
---- teamviewer7/.tvscript/.winecfg
-+++ teamviewer7/.tvscript/.winecfg
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine winecfg "$@"
---- teamviewer7/.tvscript/killteamviewer
-+++ teamviewer7/.tvscript/killteamviewer
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #  execute wineserver -k for all users running a TeamViewer
- #  (if not called by root, only successful for the current user)
- 
---- teamviewer7/.tvscript/teamviewer
-+++ teamviewer7/.tvscript/teamviewer
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "$@"
---- teamviewer7/.tvscript/wrapper
-+++ teamviewer7/.tvscript/wrapper
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- TV_base_dir="$(dirname "$TV_script_dir")"
-@@ -23,7 +23,7 @@
- export WINESERVER="$TV_Wine_bin/wineserver"
- 
- 
--function tv_Prepare()
-+tv_Prepare()
- {
-   exec 2>&1				# redirect stderr
- 
-@@ -33,7 +33,7 @@
-   setup_env
- }
- 
--function tv_Run()
-+tv_Run()
- {
-   exec 2>&1				# redirect stderr
- 
-@@ -43,7 +43,7 @@
-   "$TV_Wine_bin/$binary" "$@"
- }
- 
--function tv_LogInfo()
-+tv_LogInfo()
- {
-   exec 2>&1					# redirect stderr
- 
-@@ -71,7 +71,7 @@
-   echo " "
- }
- 
--function setup_wine()
-+setup_wine()
- {
-   # setup dosdevices and symlinks
-   local c_sym="$WINEPREFIX/dosdevices/c:"
-@@ -88,14 +88,14 @@
- }
- 
- # ensure path exists
--function make_path()
-+make_path()
- {
-   local path="$1"
-   [ -d "$path" ] || mkdir -p "$path" || die "Could not create $path"
- }
- 
- # setup/validate drive symlinks
--function setup_drive_symlink()
-+setup_drive_symlink()
- {
-   local sym="$1"
-   local dst="$2"
-@@ -107,7 +107,7 @@
- }
- 
- # setup logfile symlinks
--function setup_log_symlink
-+setup_log_symlink()
- {
-   local cuser=$(id -un)
-   local basepath="$WINEPREFIX/drive_c/users/$cuser"
-@@ -129,7 +129,7 @@
- }
- 
- # setup/validate win symlinks
--function setup_win_symlink()
-+setup_win_symlink()
- {
-   local sym="$WINEPREFIX/$1"
-   local dst="$TV_Wine_dir/$1"
-@@ -141,7 +141,7 @@
-   [ -d $(readlink -f "$sym") ] || ln -s "$dst" "$sym" || die "Could not create $sym (link to $dst)"
- }
- 
--function setup_prog_dir()
-+setup_prog_dir()
- {
-   local progdir="$WINEPREFIX/drive_c/Program Files/TeamViewer/Version7"
-   local progsrc="$TV_Wine_dir/drive_c/Program Files/TeamViewer/Version7"
-@@ -158,7 +158,7 @@
-   done
- }
- 
--function setup_wine_tweaks()
-+setup_wine_tweaks()
- {
-   # Enable Subpixel Hinting
-   if ! [ -e "$WINEPREFIX/.set_fontsmooth" ] ; then
-@@ -191,7 +191,7 @@
-   fi
- }
- 
--function setup_tar_env()
-+setup_tar_env()
- {
-   local dsrc="$TV_script_dir/teamviewer.desktop.template"
-   local ddst="$TV_script_dir/teamviewer.desktop"
-@@ -210,7 +210,7 @@
-   fi
- }
- 
--function setup_env()
-+setup_env()
- {
-   local tvwine="$TV_Wine_dir/drive_c/Program Files/TeamViewer/Version7/tvwine.dll.so"
- 
-@@ -227,7 +227,7 @@
-   (cd /etc; ls -m *-release *-version *_version > "$TV_profile/drive_c/distrelease" 2> /dev/null)
- }
- 
--function validate_user()
-+validate_user()
- {
-   local userid=$(id -un)
- 
-@@ -236,7 +236,7 @@
-   fi
- }
- 
--function validate_binary()
-+validate_binary()
- {
-   local binary="$1"
- 
-@@ -245,9 +245,11 @@
-   fi
- }
- 
--function die()
-+die()
- {
--  echo -e "\nError: $@\n"
-+  echo
-+  echo "Error: $@"
-+  echo
-   exit 1
- }
- 
diff --git a/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch b/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch
deleted file mode 100644
index 48c3712e8e74..000000000000
--- a/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-commit d3060b46b357c399d522e8346dd6c9b99c322343
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Sep 21 20:08:07 2013 +0200
-
-    remove all daemon/systemd related bits
-
-diff --git a/script/tvw_main b/script/tvw_main
-index bdff58b..1058d47 100644
---- a/script/tvw_main
-+++ b/script/tvw_main
-@@ -2,7 +2,6 @@
- 
- source "$TV_SCRIPT_DIR/tvw_config"
- source "$TV_SCRIPT_DIR/tvw_aux"
--source "$TV_SCRIPT_DIR/tvw_daemon"
- source "$TV_SCRIPT_DIR/tvw_profile"
- 
- 
-@@ -17,7 +16,6 @@ function Main()
-     --help )		PrintHelp			;;
-     --version )		PrintVersion			;;
-     --info )		PrintInfo			;;
--    --daemon )		Run_Daemon $opt			;;
-     --winecfg )		shift; Run_WineCfg "$@"		;;
-     --regedit )		shift; Run_RegEdit "$@"		;;
-     --kill )		Run_KillTeamViewer		;;
-@@ -174,26 +172,14 @@ function Run_RegEdit()
-   wine regedit "$@"
- }
- 
--function Run_Daemon()
--{
--  local opt="$1"
--
--  case "$opt" in
--    ( disable )				removeDaemon	|| rootSuggest	;;
--    ( enable  )				installDaemon	|| rootSuggest	;;
--    ( start | stop | restart )		cmdDaemon $opt	|| rootSuggest	;;
--    ( status )				cmdDaemon $opt			;;
--    ( * )				echo "unknown option '$opt'"	;;
--  esac
--}
--
- function SetPasswd()
- {
-+  echo "Stop your teamviewer daemon first, then press enter."
-+  read
-+
-   local pwd="$1"
-   [ -n "$pwd" ] || die 'no password specified'
- 
--  Run_Daemon 'stop' > /dev/null
--  
-   $TV_BIN_DIR/teamviewerd --passwd "$pwd"
-   case $? in
-     0  ) echo 'ok'	;;
-@@ -203,19 +189,19 @@ function SetPasswd()
-     *  ) echo 'unknown response'	;;
-    esac
-   
--  Run_Daemon 'start' || die 'failed to restart the daemon'
--  echo
-+   echo "You may start your teamviewer daemon again."
- }
- 
- function ExportLicense()
- {
-+  echo "Stop your teamviewer daemon first, then press enter."
-+  read
-+
-   local license="$1"
-   local path='/tmp/tv_global.conf'
- 
-   [ -n "$license" ] || die 'no license specified'
- 
--  Run_Daemon 'stop' > /dev/null
--  
-   $TV_BIN_DIR/teamviewerd --export-license "$license" "$path"
-   case $? in
-     0  ) echo "ok - license exported to '$path'"		;;
-@@ -223,8 +209,7 @@ function ExportLicense()
-     *  ) echo 'unknown response'	;;
-    esac
-   
--  Run_Daemon 'start' || die 'failed to restart the daemon'
--  echo
-+   echo "You may start your teamviewer daemon again."
- }
- 
- function CreateZipLog()
-@@ -265,20 +250,12 @@ function PrintHelp()
-   ABecho "teamviewer --passwd [PASSWD]"	"set a password (useful when installing remote (ssh)"
-   ABecho "teamviewer --ziplog"		"create a zip containing all teamviewer logs (useful when contacting support)"
-   echo
--  ABecho "teamviewer --daemon status"	"show current status of the TeamViewer daemon"
--  ABecho "teamviewer --daemon start"	"start		TeamViewer daemon"
--  ABecho "teamviewer --daemon stop"	"stop		TeamViewer daemon"
--  ABecho "teamviewer --daemon restart"	"stop/start	TeamViewer daemon"
--  ABecho "teamviewer --daemon disable"	"disable	TeamViewer daemon - don't start daemon on system startup"
--  ABecho "teamviewer --daemon enable"	"enable		TeamViewer daemon - start daemon on system startup (default)"
- }
- 
- function PrintInfo()
- {
-   PrintVersion
-   echo
--  PrintDaemonStatus
--  echo
-   PrintTeamViewerID
- }
- 
-@@ -287,15 +264,6 @@ function PrintVersion()
-   ABecho "TeamViewer" "$TV_VERSION"
- }
- 
--function PrintDaemonStatus()
--{
--  local cmd="$(daemonCtl 'status')"
--  local txt="$(eval "$cmd")"
--  [ $? = 0 ] || txt='n/a (error)'
--  
--  ABecho "teamviewerd status" "$txt"
--}
--
- function PrintTeamViewerID()
- {
-   local config="$TV_BASE_DIR/config/global.conf"
-@@ -307,6 +275,6 @@ function PrintTeamViewerID()
-     ABecho "TeamViewer ID:" "$tvid"
-   else
-     echo "TeamViewer ID: not found"
--    echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)"
-+    echo "Try restarting the TeamViewer daemon."
-   fi
- }
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index a89b1f8b3a31..b31fed4f87b0 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>dct23@cornell.edu</email>
+                <name>Devrin Talen</name>
+                <description>Proxy maintainer. Assign bugs to him</description>
+        </maintainer>
 	<use>
 		<flag name="system-wine">Use <pkg>app-emulation/wine</pkg> instead of bundled one.</flag>
 	</use>
diff --git a/net-misc/teamviewer/teamviewer-8.0.20931.ebuild b/net-misc/teamviewer/teamviewer-10.0.36281.ebuild
similarity index 60%
rename from net-misc/teamviewer/teamviewer-8.0.20931.ebuild
rename to net-misc/teamviewer/teamviewer-10.0.36281.ebuild
index 7c1eb5bc070a..ac0b1696569e 100644
--- a/net-misc/teamviewer/teamviewer-8.0.20931.ebuild
+++ b/net-misc/teamviewer/teamviewer-10.0.36281.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-8.0.20931.ebuild,v 1.2 2014/06/18 20:40:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-10.0.36281.ebuild,v 1.1 2015/03/09 05:29:03 idella4 Exp $
 
 EAPI=5
 
@@ -9,13 +9,14 @@ inherit eutils gnome2-utils systemd unpacker
 # Major version
 MV=${PV/\.*}
 MY_PN=${PN}${MV}
+
 DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
 HOMEPAGE="http://www.teamviewer.com"
 SRC_URI="http://www.teamviewer.com/download/version_${MV}x/teamviewer_linux.deb -> ${P}.deb"
 
 LICENSE="TeamViewer !system-wine? ( LGPL-2.1 )"
 SLOT=${MV}
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~*"
 IUSE="system-wine"
 
 RESTRICT="mirror"
@@ -27,15 +28,14 @@ RDEPEND="
 		amd64? (
 			app-emulation/emul-linux-x86-baselibs
 			app-emulation/emul-linux-x86-soundlibs
-			|| (
-				(
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32]
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXau-1.0.7-r1[abi_x86_32]
-					>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXfixes-5.0.1[abi_x86_32]
-					>=x11-libs/libXtst-1.2.1-r1[abi_x86_32]
+			|| ( (
+				x11-libs/libSM[abi_x86_32]
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdamage[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXfixes[abi_x86_32]
+				x11-libs/libXtst[abi_x86_32]
 				)
 				app-emulation/emul-linux-x86-xlibs
 			)
@@ -55,7 +55,7 @@ RDEPEND="
 
 QA_PREBUILT="opt/teamviewer${MV}/*"
 
-S=${WORKDIR}/opt/teamviewer${MV}/tv_bin
+S=${WORKDIR}/opt/teamviewer/tv_bin
 
 make_winewrapper() {
 	cat << EOF > "${T}/${MY_PN}"
@@ -69,15 +69,10 @@ EOF
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 	sed \
-		-e "s/@TVV@/${MV}/g" \
+		-e "s#@TVV@#${MV}/tv_bin#g" \
 		"${FILESDIR}"/${PN}d.init > "${T}"/${PN}d${MV} || die
-
-	sed -i \
-		-e "s#/opt/teamviewer8/tv_bin/teamviewerd#/opt/${MY_PN}/teamviewerd#" \
-		script/${PN}d.service || die
 }
 
 src_install () {
@@ -87,28 +82,24 @@ src_install () {
 		doexe wine/drive_c/TeamViewer/*
 	else
 		# install scripts and .reg
-		insinto /opt/${MY_PN}/script
-		doins script/*.reg
-		exeinto /opt/${MY_PN}/script
-		doexe script/teamviewer{,_desktop} script/tvw_{aux,config,main,profile}
+		insinto /opt/${MY_PN}/tv_bin
+		doins -r *
+
+		exeinto /opt/${MY_PN}/tv_bin
+		doexe TeamViewer_Desktop
+		exeinto /opt/${MY_PN}/tv_bin/script
+		doexe script/teamviewer script/tvw_{aux,config,exec,extra,main,profile}
 
-		# install internal wine
-		insinto /opt/${MY_PN}
-		doins -r wine
-		dosym /opt/${MY_PN}/script/${PN} /opt/bin/${MY_PN}
+		dosym /opt/${MY_PN}/tv_bin/script/${PN} /opt/bin/${MY_PN}
 
 		# fix permissions
-		fperms 755 /opt/${MY_PN}/wine/bin/wine{,-preloader,server}
-		fperms 755 /opt/${MY_PN}/wine/drive_c/TeamViewer/TeamViewer{,_Desktop}.exe
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/bin/wine{,-preloader,server}
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/drive_c/TeamViewer/TeamViewer.exe
 		find "${D}"/opt/${MY_PN} -type f -name "*.so*" -execdir chmod 755 '{}' \;
 	fi
 
-	# necessary symlinks
-	dosym ./script/teamviewer /opt/${MY_PN}/TeamViewer
-	dosym ./script/teamviewer_desktop /opt/${MY_PN}/TeamViewer_Desktop
-
 	# install daemon binary
-	exeinto /opt/${MY_PN}
+	exeinto /opt/${MY_PN}/tv_bin
 	doexe ${PN}d
 
 	# set up logdir
@@ -120,10 +111,10 @@ src_install () {
 	dosym /etc/${MY_PN} /opt/${MY_PN}/config
 
 	doinitd "${T}"/${PN}d${MV}
-	systemd_dounit script/${PN}d.service
+	systemd_newunit script/${PN}d.service ${PN}d${MV}.service
 
 	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	dodoc ../doc/linux_FAQ_{EN,DE}.txt
+#dodoc ../doc/linux_FAQ_{EN,DE}.txt
 	make_desktop_entry ${MY_PN} TeamViewer ${MY_PN}
 }
 
@@ -147,14 +138,7 @@ pkg_postinst() {
 	elog "Instead use the provided gentoo initscript:"
 	elog "  /etc/init.d/${PN}d${MV} start"
 	elog
-	elog "Logs are written to \"/var/log/teamviewer8\""
-
-	echo
-
-	eerror "UPDATE NOTICE!"
-	ewarn "If you update from teamviewer-8.0.17147"
-	ewarn "then you might have to remove \"~/.config/teamviewer8\", because"
-	ewarn "the install destination changed and the config might be invalid."
+	elog "Logs are written to \"/var/log/teamviewer${MV}\""
 }
 
 pkg_postrm() {
diff --git a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild b/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
deleted file mode 100644
index b42d7f0365aa..000000000000
--- a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-7.0.9377.ebuild,v 1.5 2014/11/12 23:18:50 axs Exp $
-
-EAPI=5
-
-inherit eutils gnome2-utils
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}-${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="http://www.teamviewer.com"
-SRC_URI="http://download.teamviewer.com/download/version_${MV}x/teamviewer_linux.tar.gz -> ${P}.tar.gz"
-
-LICENSE="TeamViewer !system-wine? ( LGPL-2.1 )"
-SLOT=${MV}
-KEYWORDS="~amd64 ~x86"
-IUSE="system-wine"
-
-RESTRICT="mirror"
-
-RDEPEND="
-	x11-misc/xdg-utils
-	!system-wine? (
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs
-			app-emulation/emul-linux-x86-soundlibs
-			|| (
-				(
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32]
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXau-1.0.7-r1[abi_x86_32]
-					>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXfixes-5.0.1[abi_x86_32]
-					>=x11-libs/libXtst-1.2.1-r1[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-		x86? (
-			sys-libs/zlib
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXtst
-		)
-	)
-	system-wine? ( app-emulation/wine )"
-
-QA_PREBUILT="opt/teamviewer-${MV}/*"
-
-S=${WORKDIR}/teamviewer${MV}
-
-make_winewrapper() {
-	cat << EOF > "${T}/${MY_PN}"
-#!/bin/sh
-exec wine "/opt/${MY_PN}/bin/TeamViewer.exe" "\$@"
-EOF
-	chmod go+rx "${T}/${MY_PN}"
-	exeinto /opt/bin
-	doexe "${T}/${MY_PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-POSIX.patch
-}
-
-src_install () {
-	if use system-wine ; then
-		make_winewrapper
-		exeinto /opt/${MY_PN}/bin
-		doexe "${S}/.wine/drive_c/Program Files/TeamViewer/Version7/"*
-	else
-		# install scripts and .reg
-		insinto /opt/${MY_PN}/bin
-		find ".tvscript" -type f \( \! -name "${PN}.desktop*" -a \! -name "${PN}.png" \) \
-			-maxdepth 1 -execdir doins '{}' \;
-
-		# install wine
-		insinto /opt/${MY_PN}/wine
-		doins -r "${S}"/.wine/*
-		dosym /opt/${MY_PN}/bin/${PN} /opt/bin/${MY_PN}
-
-		# fix permissions
-		fperms 755 /opt/${MY_PN}/bin/{${PN},wrapper,killteamviewer}
-		fperms 755 /opt/${MY_PN}/wine/bin/wine{,-preloader,server}
-		fperms 755 "/opt/${MY_PN}/wine/drive_c/Program Files/TeamViewer/Version${MV}"/TeamViewer{,_Desktop}.exe
-		find "${D}"/opt/${MY_PN} -type f -name "*.so*" -execdir chmod 755 '{}' \;
-	fi
-
-	newicon -s 48 "${S}"/.tvscript/${PN}.png ${MY_PN}.png
-	dodoc linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} TeamViewer-${MV} ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if use system-wine ; then
-		echo
-		eerror "IMPORTANT NOTICE!"
-		elog "Using ${PN} with system wine is not supported and experimental."
-		elog "Do not report gentoo bugs while using this version."
-		echo
-	fi
-
-	elog "Logs are written to:"
-	elog "  ~/.teamviewer/7"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index c36539851c8b..88ff133fdd84 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,3 +1,4 @@
 DIST wget-1.16.1.tar.xz 1760120 SHA256 2b96c707ee15fe847f5bc2f872a7a530dca803b927a750419b44f50803e14d33 SHA512 28f69b2037bb3ea34b109bb20d99da7056e025dd9cce18a74cde2ffcc61933625b643673c76a7ba59b42d7e029898774da2d8af0fdbca3cffd5e4434c30e339a WHIRLPOOL a5ed1b7515acbfb33390c575588f8f476bf537eb90ebaaeb2b880e1962f15a6992eb7aa4a977b554fc6e34d384569f132760df7df9c48007e369e9773ceda696
 DIST wget-1.16.2.tar.xz 1805080 SHA256 a7dfde1bcb0eb135addf587a649fd0e47c1a876edef359b9197cdffd1fdcd7d5 SHA512 ec99606577afb131fa1eb3c286a3dd9dccea689bf5c83df8303b1130ed569934ca27f8c517a06f9e2be456c020480842cbf8eebe97285890e46dca60158f3c12 WHIRLPOOL 2b174aa4223d3f3ff64366b96ed5f725e4c4a1c96f2aa01ab4ee0eac702a600869a71636a1860bd9ebca6fad5e0c16164280ca202f92254b6b5052a10bdf0fb7
+DIST wget-1.16.3.tar.xz 1794148 SHA256 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 SHA512 2d1fe632bcd116a68ae333278e368cb810081b51d2259ddade602bebf3dd08dee1f51f67c9c7d79d2410e19fe0d48a0b9a1b1a7c7c6eeb47e2840ce6c1a3471c WHIRLPOOL b8fe9880523fc295b092c3b9ff4f9af58c071f55d516903ded66df67722cd27955ad651f6f2f6032b611e5445dd89b8ff97878443abc04d095c29e76f0564490
 DIST wget-1.16.tar.xz 1697308 SHA256 9261dd090a17687b6dc0682a257e90a926def15624b650e8f799af57e5c8b0e7 SHA512 20f1247a344cac8f9120a506a4ca1fff84e5f3f5abb8492f67c22d213cb41cbfa24d5a68b91512a6ca42765d319bea8785adff8fad58d854f8f563c6593b4298 WHIRLPOOL a1094b27f77547baf7dac6f1a6ded691b3a043caff948e8fd84555a730d6a02ae157f4d72144f3c1672439166da28a4cca26f9c4f7ec4473603899545cc956b4
diff --git a/net-misc/wget/wget-1.16.3.ebuild b/net-misc/wget/wget-1.16.3.ebuild
new file mode 100644
index 000000000000..6baaf95427a0
--- /dev/null
+++ b/net-misc/wget/wget-1.16.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.16.3.ebuild,v 1.1 2015/03/09 17:46:59 vapier Exp $
+
+EAPI="4"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs autotools
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="http://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
+
+LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls[static-libs(+)] )
+		!gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_enable ssl opie) \
+		$(use_enable ssl digest) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable debug) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 138e15a55030..a88c6920ccf0 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,2 +1,3 @@
 DIST youtube-dl-2014.11.02.1.tar.gz 1123292 SHA256 2e4ee5cc168eb56f778beec48809aa18068c22f8bbaa1911f5b69cf51edb609e SHA512 0a21d216c36642a079e837440d05338970abd30352564a41267ddb33ff4afd866a28aa678c7186b2a0dd4a11e8ec1e36b55bdf1307b3f23b9f2d3422d8ab9fbd WHIRLPOOL 6bbd185c60371ef553899a2838950fcefa849c76b8ec70d18106e38f9be3ec0bc28c799bd3de3d4ad6a0956699ed6613706b7b4205fcddef1f0ec4bc7c9772a7
 DIST youtube-dl-2015.03.03.1.tar.gz 1407072 SHA256 31e4dd019c1564f9a2b9ad187b461d2fd0c9d1fa3f636ea36d5dd970fb77f539 SHA512 de139c280a59fb3a521a1b6169e59c65915828e49ef38d53a5da53eae6cf9bcd7b65cc3072ba3a13592d8859d6f575bc39bc62e8da87568265230be25cda2df3 WHIRLPOOL bc912d44818a190d31f015930a3b439569993b304d977e3e207c1ae27625fcbb3b27a0012b04d5f62adbfe80c2d1aac227730bbf473cc8936eac64af7b5b27f3
+DIST youtube-dl-2015.03.09.tar.gz 1421339 SHA256 bf87403cccf292d6133d358ea0cf6c74a5daef095d6a9f0b9becffd6d3a9b757 SHA512 cf45a171a5d9c2fd74252b05e3c2a9ce2ab9ba65993ca314711016f1746b1a7884e0dcf67fe0d7d25838c7895fd2cfe8b39316edefe51f5b523f9cd400b0a93f WHIRLPOOL 737a8d997aee8b5ae4ca16c1d6077b62c2a7dea2afc8121f9b144dc392c5812450ea5f0670a523573a6776ad0eaa7f6214be43609a93a48291d92b178ffbd747
diff --git a/net-misc/youtube-dl/youtube-dl-2015.03.09.ebuild b/net-misc/youtube-dl/youtube-dl-2015.03.09.ebuild
new file mode 100644
index 000000000000..6f6e08dba91f
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2015.03.09.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.03.09.ebuild,v 1.1 2015/03/09 05:08:46 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="http://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+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="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink drtuber empflix eporner eroprofile
+			extremetube fourtube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies mofosex motherless pornhd pornotube
+			pornoxo redtube sexykarma sexu sunporno slutload spankwire thisav
+			tnaflix trutube tube8 vporn xbef xhamster xnxx xtube xvideos
+			xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			pornhub
+		)
+		# do single line imports
+		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
+		# do multiple line imports
+		sed -i -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) youtube_dl/extractor/__init__.py || die
+
+		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py || die
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/net-print/cups-filters/cups-filters-1.0.66.ebuild b/net-print/cups-filters/cups-filters-1.0.66.ebuild
index de80e01eaec9..f051d360b6cd 100644
--- a/net-print/cups-filters/cups-filters-1.0.66.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.66.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.66.ebuild,v 1.1 2015/03/04 17:41:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.66.ebuild,v 1.2 2015/03/09 11:19:26 jer Exp $
 
 EAPI=5
 
@@ -11,10 +11,10 @@ inherit base eutils perl-module autotools systemd
 if [[ "${PV}" == "9999" ]] ; then
 	inherit bzr
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
+	KEYWORDS="hppa"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups PDF filters"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d6f72074caaf..be9dfd89d81a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.656 2015/03/08 07:38:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.657 2015/03/09 18:15:22 mr_bones_ Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Michael Sterrett <mr_bones_@gentoo.org> (09 Mar 2015)
+# Mask qt5 support until qt5 is stable so as to not
+# hold up making yabause stable.
+games-emulation/yabause qt5
+
 # Michał Górny <mgorny@gentoo.org> (01 Mar 2015)
 # pidgin-opensteamworks is only available for amd64, ppc32 and x86
 net-im/telepathy-connection-managers steam
diff --git a/profiles/desc/input_devices.desc b/profiles/desc/input_devices.desc
index edbc664f64a1..75fe1cb43628 100644
--- a/profiles/desc/input_devices.desc
+++ b/profiles/desc/input_devices.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/input_devices.desc,v 1.13 2015/02/21 14:22:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/input_devices.desc,v 1.14 2015/03/09 00:12:01 idella4 Exp $
 
 # This file contains descriptions of INPUT_DEVICES USE_EXPAND flags.
 
@@ -45,6 +45,7 @@ roccat_lua - INPUT_DEVICES setting to build driver for Roccat Lua input devices
 roccat_pyra - INPUT_DEVICES setting to build driver for Roccat Pyra input devices
 roccat_savu - INPUT_DEVICES setting to build driver for Roccat Savu input devices
 roccat_ryosmk - INPUT_DEVICES setting to build driver for Roccat RyosMK Pro input devices
+roccat_ryostkl - INPUT_DEVICES setting to build driver for Roccat RyosMK Pro input devices
 roccat_tyon - INPUT_DEVICES setting to build driver for Roccat Tyon input devices
 spaceorb - INPUT_DEVICES setting to build driver for spaceorb input devices
 summa - INPUT_DEVICES setting to build driver for summa input devices
diff --git a/profiles/package.mask b/profiles/package.mask
index 8dfc24f3d206..896b01ac58aa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16406 2015/03/08 13:17:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16407 2015/03/09 16:58:05 mr_bones_ Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -236,11 +236,6 @@ app-portage/portage-mod_jabber
 # Depends on >=dev-libs/isl-0.14:0/14 currently masked.
 >=dev-libs/cloog-0.18.3
 
-# Michael Sterrett <mr_bones_@gentoo.org> (04 Feb 2015)
-# No upstream anymore; nothing in the tree uses it.
-# masked for removal on 20150306
-media-libs/sdl-flic
-
 # Eray Aslan <eras@gentoo.org> (03 Feb 2015)
 # Mask experimental software
 =mail-mta/postfix-3.1*
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 86379b8fab60..97ebd3206091 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.1 2015/02/01 18:12:35 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.2 2015/03/09 17:57:49 kensington Exp $
 
 # Not required, but makes life easier with Qt; bug 457934
 app-arch/unzip natspec
@@ -33,6 +33,7 @@ dev-qt/qtcore icu
 media-libs/mesa egl
 
 # Allow certain KDE 4 components to be coinstalled with Plasma 5
+<dev-util/kdevelop-4.8.0 -gdbui
 kde-base/baloo minimal
 kde-base/kactivities minimal
 kde-base/kde-meta minimal
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 680360fc4b10..bd5664e58cf5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -464,6 +464,7 @@ app-editors/joe:xterm - Enable full xterm clipboard support
 app-editors/latexila:latexmk - Install dev-tex/latexmk (used by default for the build tools)
 app-editors/latexila:rubber - Install dev-tex/rubber (can be used for the build tools)
 app-editors/leafpad:emacs - Enable Emacs key theme
+app-editors/mousepad:gtk3 - Use GTK+3 instead of GTK+2
 app-editors/nano:debug - Enable debug messages and assert warnings. Note that these will all be sent straight to stderr rather than some logging facility.
 app-editors/nano:justify - Enable justify/unjustify functions for text formatting.
 app-editors/nano:magic - Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
@@ -2759,7 +2760,6 @@ games-emulation/pcsxr:sdl - Use SDL sound backend (other parts of SDL are used u
 games-emulation/snes9x:netplay - Enable playing ROMs over the network (not recommended)
 games-emulation/snes9x:xrandr - Enable support for the X xrandr extension
 games-emulation/vbam:link - Enable GBA linking functionality
-games-emulation/yabause:qt4 - Use qt4 gui instead of gtk+
 games-emulation/zsnes:debug - Enable the builtin debugger
 games-emulation/zsnes:pax_kernel - Triggers a paxmarking of the binary
 games-engines/frobtads:tads2compiler - Build TADS2 compiler
@@ -6869,6 +6869,7 @@ sys-block/fio:glusterfs - Enable GlusterFS gfapi support via sys-cluster/gluster
 sys-block/fio:gnuplot - Install tools for generating gnuplots
 sys-block/fio:numa - Enable numa support
 sys-block/fio:rbd - Enable Rados block device support via sys-cluster/ceph
+sys-block/fio:rdma - Enable infiniband support via sys-infiniband/librdmacm
 sys-block/gparted:btrfs - Include Btrfs support (sys-fs/btrfs-progs)
 sys-block/gparted:dmraid - Support for dmraid devices, also known as ATA-RAID, or Fake RAID.
 sys-block/gparted:f2fs - Include F2FS support (sys-fs/f2fs-tools)
diff --git a/sci-biology/cutg/cutg-160-r1.ebuild b/sci-biology/cutg/cutg-160-r1.ebuild
index af80a2de92c3..5c108f974a26 100644
--- a/sci-biology/cutg/cutg-160-r1.ebuild
+++ b/sci-biology/cutg/cutg-160-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/cutg/cutg-160-r1.ebuild,v 1.2 2015/03/07 19:59:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/cutg/cutg-160-r1.ebuild,v 1.3 2015/03/09 11:44:41 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ LICENSE="public-domain"
 # Minimal build keeps only the indexed files (if applicable) and the
 # documentation. The non-indexed database is not installed.
 IUSE="emboss minimal"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 DEPEND="emboss? ( sci-biology/emboss )"
 RDEPEND="${DEPEND}"
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild
index 5b311ded7b68..c2bc7d86b316 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild,v 1.4 2014/10/27 14:25:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r11.ebuild,v 1.5 2015/03/09 13:24:16 jlec Exp $
 
 EAPI=3
 
@@ -20,11 +20,11 @@ HOMEPAGE="http://www.ccp4.ac.uk/"
 SRC="ftp://ftp.ccp4.ac.uk/ccp4"
 SRC_URI="
 	${SRC}/${PV}/${MY_P}-core-src.tar.gz
-	http://dev.gentooexperimental.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
+	http://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
 # patch tarball from upstream
 	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
 # patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
 
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild
index 9d91860b2017..a3e9a6fe1307 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild,v 1.3 2014/10/27 14:25:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r12.ebuild,v 1.4 2015/03/09 13:24:16 jlec Exp $
 
 EAPI=3
 
@@ -20,11 +20,11 @@ HOMEPAGE="http://www.ccp4.ac.uk/"
 SRC="ftp://ftp.ccp4.ac.uk/ccp4"
 SRC_URI="
 	${SRC}/${PV}/${MY_P}-core-src.tar.gz
-	http://dev.gentooexperimental.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
+	http://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
 # patch tarball from upstream
 	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
 # patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
 
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild
index 79a364af3160..e126527a5c44 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild,v 1.1 2015/01/18 19:04:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r13.ebuild,v 1.2 2015/03/09 13:24:16 jlec Exp $
 
 EAPI=5
 
@@ -20,11 +20,11 @@ HOMEPAGE="http://www.ccp4.ac.uk/"
 SRC="ftp://ftp.ccp4.ac.uk/ccp4"
 SRC_URI="
 	${SRC}/${PV}/${MY_P}-core-src.tar.gz
-	http://dev.gentooexperimental.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
+	http://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
 # patch tarball from upstream
 	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
 # patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
 
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild
new file mode 100644
index 000000000000..86c2b6abea39
--- /dev/null
+++ b/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ccp4i-6.1.3-r4.ebuild,v 1.1 2015/03/09 13:30:18 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python-single-r1 virtualx
+
+MY_PN="${PN%i}"
+MY_P="${MY_PN}-${PV}"
+
+#UPDATE="04_03_09"
+#PATCHDATE="090511"
+
+SRC="ftp://ftp.ccp4.ac.uk/ccp4"
+
+DESCRIPTION="Protein X-ray crystallography toolkit -- graphical interface"
+HOMEPAGE="http://www.ccp4.ac.uk/"
+SRC_URI="
+	${SRC}/${PV}/${MY_P}-core-src.tar.gz
+	mirror://gentoo/${P}-arpwarp.patch.bz2
+	http://dev.gentoo.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
+[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
+[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="ccp4"
+IUSE=""
+
+RDEPEND="
+	app-shells/tcsh
+	media-gfx/graphviz
+	>=dev-lang/tk-8.3
+	>=dev-tcltk/blt-2.4
+	sci-libs/ccp4-libs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-baubles.patch
+	"${WORKDIR}"/${P}-arpwarp.patch
+	)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	[[ ! -z ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
+
+	epatch "${WORKDIR}"/${PV}-oasis4.0.patch
+	python_fix_shebang ccp4i/ share/dbccp4i/
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	# rm imosflm stuff
+	rm -rf "${S}"/ccp4i/{bin/imosflm,imosflm} || die
+
+	rm -rf "${S}"/ccp4i/{bin,etc}/WINDOWS || die
+
+	# This is installed by mrbump
+	rm -rf "${S}"/ccp4i/{tasks/{dbviewer.tcl,mrbump.*},templates/mrbump.com,scripts/mrbump.script} || die
+
+	# CCP4Interface - GUI
+	insinto /usr/$(get_libdir)/ccp4
+	doins -r "${S}"/ccp4i
+	exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
+	doexe "${S}"/ccp4i/bin/*
+	dosym ../$(get_libdir)/ccp4/ccp4i/bin/ccp4i /usr/bin/ccp4i
+
+	dodir /usr/$(get_libdir)/ccp4/ccp4i/unix
+
+	# dbccp4i
+	insinto /usr/share/ccp4
+	doins -r "${S}"/share/dbccp4i
+}
+
+pkg_postinst() {
+	_ccp4-setup() {
+		source "${EPREFIX}/etc/profile"
+		export USER=root
+		bash "${EPREFIX}"/usr/$(get_libdir)/ccp4/ccp4i/bin/ccp4i -h > /dev/null
+	}
+	VIRTUALX_COMMAND="_ccp4-setup" virtualmake
+	echo ""
+	elog "ccp4i needs some enviromental settings. So please"
+	elog "\t source ${EPREFIX}/etc/profile"
+	echo ""
+}
diff --git a/sci-chemistry/oasis/oasis-4.0-r2.ebuild b/sci-chemistry/oasis/oasis-4.0-r2.ebuild
deleted file mode 100644
index 5b1f95aca5e9..000000000000
--- a/sci-chemistry/oasis/oasis-4.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r2.ebuild,v 1.13 2012/10/19 10:04:45 jlec Exp $
-
-EAPI=3
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-MY_P="${PN}${PV}_Linux"
-
-DESCRIPTION="A direct-method program for SAD/SIR phasing"
-HOMEPAGE="http://cryst.iphy.ac.cn/Project/protein/protein-I.html"
-SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${MY_P}.zip"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="ccp4 oasis"
-IUSE="examples +minimal"
-
-RDEPEND="
-	!dev-ml/oasis
-	sci-chemistry/ccp4-apps
-	sci-chemistry/pymol
-	sci-libs/mmdb
-	sci-visualization/gnuplot
-	!minimal? (
-		sci-chemistry/solve-resolve-bin
-		sci-chemistry/arp-warp-bin
-	)"
-DEPEND="${RDEPEND}
-	sci-libs/ccp4-libs"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	rm bin/{fnp2fp,gnuplot,oasis4-0,seq} || die
-	epatch "${FILESDIR}"/${PV}-makefile.patch
-}
-
-src_compile() {
-	emake \
-		-C src \
-		F77="$(tc-getFC)" \
-		CFLAGS="${FFLAGS}" \
-		CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \
-		Linux || die
-}
-
-src_install() {
-	exeinto /usr/libexec/ccp4/bin/
-	doexe src/{${PN},fnp2fp} || die
-	dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
-	dosym ../libexec/ccp4/bin/fnp2fp /usr/bin/fnp2fp
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/*.*sh || die
-
-	insinto /usr/share/doc/${PF}/html
-	doins bin/html/* || die
-	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/${PN}/html
-	chmod 755 "${ED}"/usr/share/doc/${PF}/html/*.{*sh,awk} || die
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples || die
-	fi
-
-	cat >> "${T}"/25oasis <<- EOF
-	oasisbin="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	EOF
-
-	doenvd "${T}"/25oasis
-}
diff --git a/sci-chemistry/oasis/oasis-4.0-r3.ebuild b/sci-chemistry/oasis/oasis-4.0-r3.ebuild
index a7726f948a48..b7ec6733af2c 100644
--- a/sci-chemistry/oasis/oasis-4.0-r3.ebuild
+++ b/sci-chemistry/oasis/oasis-4.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r3.ebuild,v 1.6 2013/12/24 12:43:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r3.ebuild,v 1.7 2015/03/09 13:33:02 jlec Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ MY_P="${PN}${PV}_Linux"
 
 DESCRIPTION="A direct-method program for SAD/SIR phasing"
 HOMEPAGE="http://cryst.iphy.ac.cn/Project/protein/protein-I.html"
-SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${MY_P}.zip"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${MY_P}.zip"
 
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
@@ -20,7 +20,7 @@ IUSE="examples +minimal"
 RDEPEND="
 	sci-chemistry/ccp4-apps
 	sci-chemistry/pymol
-	sci-libs/mmdb
+	sci-libs/mmdb:0
 	sci-visualization/gnuplot
 	!minimal? (
 		sci-chemistry/solve-resolve-bin
diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest
new file mode 100644
index 000000000000..be3eecb6e270
--- /dev/null
+++ b/sci-libs/bliss/Manifest
@@ -0,0 +1 @@
+DIST bliss-0.72.zip 90970 SHA256 528d192b1e30722fc60f5f12c9d6c12b374d838198ae7f18fb41bedabf735ed3 SHA512 a09b3cea26e3ff5f5733f10bfaadaf6fb5a3f443e1cc306fad16af2f7b4cd97c90652315f911a324d6d71426a3d098cd5c7e5721f69c599fe2e0d6d34caa0ef5 WHIRLPOOL afbc41c04e843d383a2da8d5e26ec2882c847e8e5f1e71c05f884396fcc79eab764df628523336b88e0c6ef4fbf073a52870e2c68ded428002d9391894cb53d6
diff --git a/sci-libs/bliss/bliss-0.72.ebuild b/sci-libs/bliss/bliss-0.72.ebuild
new file mode 100644
index 000000000000..5c2d35c2735a
--- /dev/null
+++ b/sci-libs/bliss/bliss-0.72.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/bliss/bliss-0.72.ebuild,v 1.1 2015/03/09 12:51:38 tomka Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip"
+DESCRIPTION="A Tool for Computing Automorphism Groups and Canonical Labelings of Graphs"
+HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/index.shtml"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gmp static-libs"
+
+RDEPEND="gmp? ( dev-libs/gmp )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" #comes with pkg-config file
+
+PATCHES=(
+	"${FILESDIR}/${P}-fedora.patch"
+	"${FILESDIR}/${P}-autotools.patch"
+)
+
+src_configure() {
+	local myeconfargs=( $(use_with gmp) )
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use doc; then
+		cd "${BUILD_DIR}"
+		emake html
+		dohtml -r html
+	fi
+}
diff --git a/sci-libs/bliss/files/bliss-0.72-autotools.patch b/sci-libs/bliss/files/bliss-0.72-autotools.patch
new file mode 100644
index 000000000000..d30c51622e2e
--- /dev/null
+++ b/sci-libs/bliss/files/bliss-0.72-autotools.patch
@@ -0,0 +1,159 @@
+Replace simple Makefile by autotools
+- allow shared library
+- parallel build
+- added pkg-config support
+
+Author: Christoph Junghans <ottxor@gentoo.org>
+
+diff -Naur bliss-0.72-fedora/config/.dummy bliss-0.72/config/.dummy
+--- bliss-0.72-fedora/config/.dummy	1969-12-31 17:00:00.000000000 -0700
++++ bliss-0.72/config/.dummy	2013-04-28 14:43:06.143760368 -0600
+@@ -0,0 +1 @@
++Dummy file to make patch create config dir, which is needed for autotools
+diff -Naur bliss-0.72-fedora/configure.ac bliss-0.72/configure.ac
+--- bliss-0.72-fedora/configure.ac	1969-12-31 17:00:00.000000000 -0700
++++ bliss-0.72/configure.ac	2013-04-28 14:40:42.283242722 -0600
+@@ -0,0 +1,31 @@
++AC_PREREQ([2.65])
++AC_INIT([bliss], [0.72], [Tommi.Junttil@kk.fi])
++
++AC_CONFIG_AUX_DIR(config)
++AC_CONFIG_MACRO_DIR(config)
++
++AM_INIT_AUTOMAKE([1.8 foreign])
++
++SHARED_VERSION_INFO="1:0:0"
++AC_SUBST(SHARED_VERSION_INFO)
++
++# Checks for programs.
++AC_PROG_CXX
++
++LT_INIT
++# Checks for libraries.
++AC_ARG_WITH([gmp],
++  [AS_HELP_STRING([--with-gmp], [enable support for GNU Multiple Precision Arithmetic Library @<:@default=check@:>@])],
++  [], [with_readline=no])
++AS_IF([test "x$with_readline" != xno],
++  [AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Cannot find gmp.h header]))
++    AC_CHECK_LIB([gmp],_init,,AC_MSG_ERROR([Cannot find gmp library]))
++    AC_SUBST([GMP],[-lgmp])
++    [CPPFLAGS="$CPPFLAGS -DBLISS_USE_GMP"]])
++
++AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,no)
++AM_CONDITIONAL(HAVE_DOXYGEN,[test .$DOXYGEN != .no])
++
++AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([bliss.pc])
++AC_OUTPUT
+diff -Naur bliss-0.72-fedora/bliss.pc.in bliss-0.72/bliss.pc.in
+--- bliss-0.72-fedora/bliss.pc.in	1969-12-31 17:00:00.000000000 -0700
++++ bliss-0.72/bliss.pc.in	2013-04-28 14:40:54.223285686 -0600
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: bliss
++Description: Library for Computing Automorphism Groups and Canonical Labelings of Graphs 
++URL: http://www.tcs.hut.fi/Software/bliss/index.shtml
++Version: @VERSION@
++Requires: 
++Libs: -L${libdir} -lbliss @GMP@
++Libs.private: -lm
++Cflags: -I${includedir}
+diff -Naur bliss-0.72-fedora/Makefile bliss-0.72/Makefile
+--- bliss-0.72-fedora/Makefile	2013-04-28 14:40:10.543128514 -0600
++++ bliss-0.72/Makefile	1969-12-31 17:00:00.000000000 -0700
+@@ -1,57 +0,0 @@
+-CFLAGS = -I.
+-CFLAGS += -g
+-#CFLAGS += -pg
+-CFLAGS += -Wall
+-CFLAGS += --pedantic
+-CFLAGS += -O9
+-#CFLAGS += -DBLISS_DEBUG
+-CFLAGS += -fPIC
+-
+-SRCS = defs.cc graph.cc partition.cc orbit.cc uintseqhash.cc heap.cc
+-SRCS += timer.cc utils.cc bliss_C.cc
+-
+-OBJS = $(addsuffix .o, $(basename $(SRCS)))
+-
+-GMPOBJS = $(addsuffix g,  $(OBJS))
+-
+-LIB =
+-#LIB += /usr/lib/ccmalloc.o -ldl
+-
+-CC = g++
+-RANLIB = ranlib
+-AR = ar
+-BLISSLIB = libbliss.a
+-
+-gmp:	LIB += -lgmp
+-gmp:	CFLAGS += -DBLISS_USE_GMP
+-
+-normal:	bliss
+-gmp:	bliss_gmp
+-
+-
+-all:: lib bliss
+-
+-%.o %.og:	%.cc
+-	$(CC) $(CFLAGS) -c -o $@ $<
+-
+-lib: $(OBJS)
+-	rm -f $(BLISSLIB)
+-	$(AR) cr $(BLISSLIB) $(OBJS)
+-	$(RANLIB) $(BLISSLIB)
+-
+-lib_gmp: $(GMPOBJS)
+-	rm -f $(BLISSLIB)
+-	$(AR) cr $(BLISSLIB) $(GMPOBJS)
+-	$(RANLIB) $(BLISSLIB)
+-
+-bliss: bliss.o lib $(OBJS)
+-	$(CC) $(CFLAGS) -o bliss bliss.o $(OBJS) $(LIB)
+-
+-bliss_gmp: bliss.og lib_gmp $(GMPOBJS)
+-	$(CC) $(CFLAGS) -o bliss bliss.og $(GMPOBJS) $(LIB)
+-
+-
+-clean:
+-	rm -f bliss $(BLISSLIB) $(OBJS) bliss.o $(GMPOBJS) bliss.og
+-
+-# DO NOT DELETE
+diff -Naur bliss-0.72-fedora/Makefile.am bliss-0.72/Makefile.am
+--- bliss-0.72-fedora/Makefile.am	1969-12-31 17:00:00.000000000 -0700
++++ bliss-0.72/Makefile.am	2013-04-28 14:47:26.944698789 -0600
+@@ -0,0 +1,30 @@
++ACLOCAL_AMFLAGS = -I config
++
++lib_LTLIBRARIES = libbliss.la
++
++libbliss_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libbliss_la_SOURCES = \
++	defs.cc graph.cc partition.cc orbit.cc uintseqhash.cc heap.cc \
++	timer.cc utils.cc bliss_C.cc
++
++pkginclude_HEADERS = \
++	bignum.hh bliss_C.h defs.hh graph.hh heap.hh kqueue.hh kstack.hh \
++	orbit.hh partition.hh timer.hh uintseqhash.hh utils.hh
++
++bin_PROGRAMS = bliss
++bliss_SOURCES = bliss.cc
++bliss_LDADD = libbliss.la
++dist_man1_MANS = bliss.1
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = bliss.pc
++
++html-local: Doxyfile
++if HAVE_DOXYGEN
++	$(DOXYGEN) $(srcdir)/Doxyfile
++else
++	@echo "doxygen was not found, please re-run configure"
++endif
++
++clean-local:
++	-rm -rf html
diff --git a/sci-libs/bliss/files/bliss-0.72-fedora.patch b/sci-libs/bliss/files/bliss-0.72-fedora.patch
new file mode 100644
index 000000000000..e1f8b6685109
--- /dev/null
+++ b/sci-libs/bliss/files/bliss-0.72-fedora.patch
@@ -0,0 +1,648 @@
+Pulled on 28-04-13 from
+http://pkgs.fedoraproject.org/cgit/bliss.git/tree/
+
+- Man page written by Jerry James using text borrowed from the sources.
+  The man page therefore has the same copyright and license as the sources.
+- Don't call exit() in library code.
+- Patch from Thomas Rehn, also sent upstream.  Fix one bug and add one
+   performance enhancement.
+
+diff -Naur bliss-0.72.orig/bliss.1 bliss-0.72/bliss.1
+--- bliss-0.72.orig/bliss.1	1969-12-31 17:00:00.000000000 -0700
++++ bliss-0.72/bliss.1	2013-04-28 14:35:37.000000000 -0600
+@@ -0,0 +1,55 @@
++.TH "BLISS" "1" "@VERSION@" "Tommi Junttila & Petteri Kaski" "User Commands"
++.SH "NAME"
++bliss \- Compute automorphism groups and canonical labelings of graphs
++.SH "SYNOPSIS"
++.B bliss
++[\fIOPTIONS\fR] [<\fIGRAPH FILE\fR>]
++.SH "DESCRIPTION"
++.PP
++Bliss is an open source tool for computing automorphism groups and
++canonical forms of graphs.  The graphs are specified in DIMACS format.
++.TP
++\fB\-directed\fR
++the input graph is directed
++.TP
++\fB\-can\fR
++compute canonical form
++.TP
++\fB\-ocan\fR=\fIf\fR
++compute canonical form and output it in file \fIf\fR
++.TP
++\fB\-v\fR=\fIN\fR
++set verbosity level to N [N >= 0, default: 1]
++.TP
++\fB\-sh\fR=\fIX\fR
++select splitting heuristics, where X is:
++.TS
++tab(;);
++R L.
++f;first non-singleton cell
++fl;first largest non-singleton cell
++fs;first smallest non-singleton cell
++fm;first maximally non-trivially connected non-singleton cell
++flm;first largest maximally non-trivially connected
++;non-singleton cell
++fsm;first smallest maximally non-trivially connected
++;non-singleton cell (default)
++.TE
++.TP
++\fB\-fr\fR=\fIX\fR
++use failure recording? [X=y/n, default: y]
++.TP
++\fB\-cr\fR=\fIX\fR
++use component recursion? [X=y/n, default: y]
++.TP
++\fB\-version\fR
++print the version number and exit
++.TP
++\fB\-help\fR
++print this help and exit
++.SH "AUTHORS"
++Bliss was written by Tommi Junttila <Tommi.Junttila@tkk.fi> and
++Petteri Kaski <petteri.kaski@aalto.fi>.
++.PP
++This man page was written by Jerry James <loganjerry@gmail.com>.
++It is distributed under the same terms as bliss.
+diff -Naur bliss-0.72.orig/bliss.cc bliss-0.72/bliss.cc
+--- bliss-0.72.orig/bliss.cc	2013-04-28 14:35:20.582085167 -0600
++++ bliss-0.72/bliss.cc	2013-04-28 14:36:28.792330603 -0600
+@@ -276,13 +276,16 @@
+   if(opt_canonize == false)
+     {
+       /* No canonical labeling, only automorphism group */
+-      g->find_automorphisms(stats, &report_aut, stdout);
++      if (!g->find_automorphisms(stats, &report_aut, stdout))
++	exit(1);
+     }
+   else
+     {
+       /* Canonical labeling and automorphism group */
+       const unsigned int* cl = g->canonical_form(stats, &report_aut, stdout);
+ 
++      if (!cl)
++	exit(1);
+       fprintf(stdout, "Canonical labeling: ");
+       bliss::print_permutation(stdout, g->get_nof_vertices(), cl, 1);
+       fprintf(stdout, "\n");
+@@ -290,6 +293,8 @@
+       if(opt_output_can_file)
+ 	{
+ 	  bliss::AbstractGraph* cf = g->permute(cl);
++	  if (!cf)
++	    exit(1);
+ 	  FILE* const fp = fopen(opt_output_can_file, "w");
+ 	  if(!fp)
+ 	    _fatal("Cannot open '%s' for outputting the canonical form, aborting", opt_output_can_file);
+diff -Naur bliss-0.72.orig/bliss_C.cc bliss-0.72/bliss_C.cc
+--- bliss-0.72.orig/bliss_C.cc	2013-04-28 14:35:20.582085167 -0600
++++ bliss-0.72/bliss_C.cc	2013-04-28 14:36:28.792330603 -0600
+@@ -131,7 +131,7 @@
+ }
+ 
+ extern "C"
+-void
++int
+ bliss_find_automorphisms(BlissGraph *graph,
+ 			 void (*hook)(void *user_param,
+ 				      unsigned int n,
+@@ -142,7 +142,8 @@
+   bliss::Stats s;
+   assert(graph);
+   assert(graph->g);
+-  graph->g->find_automorphisms(s, hook, hook_user_param);
++  if (!graph->g->find_automorphisms(s, hook, hook_user_param))
++    return 0;
+ 
+   if(stats)
+     {
+@@ -154,6 +155,7 @@
+       stats->nof_generators = s.get_nof_generators();
+       stats->max_level = s.get_max_level();
+     }
++  return 1;
+ }
+ 
+ 
+@@ -173,7 +175,7 @@
+   
+   canonical_labeling = graph->g->canonical_form(s, hook, hook_user_param);
+ 
+-  if(stats)
++  if(canonical_labeling && stats)
+     {
+       stats->group_size_approx = s.get_group_size_approx();
+       stats->nof_nodes = s.get_nof_nodes();
+diff -Naur bliss-0.72.orig/bliss_C.h bliss-0.72/bliss_C.h
+--- bliss-0.72.orig/bliss_C.h	2013-04-28 14:35:20.582085167 -0600
++++ bliss-0.72/bliss_C.h	2013-04-28 14:36:28.792330603 -0600
+@@ -156,6 +156,7 @@
+  * The argument \a perm should be an array of
+  * N=bliss::bliss_get_nof_vertices(\a graph) elements describing
+  * a bijection on {0,...,N-1}.
++ * Returns NULL if insufficient memory or internal error.
+  */
+ BlissGraph *bliss_permute(BlissGraph *graph, const unsigned int *perm);
+ 
+@@ -174,8 +175,9 @@
+  * if you want to use the automorphism later, you have to take a copy of it.
+  * Do not call bliss_* functions in the hook.
+  * If \a stats is non-null, then some search statistics are copied there.
++ * \return nonzero if successful, zero if insufficient memory or internal error
+  */
+-void
++int
+ bliss_find_automorphisms(BlissGraph *graph,
+ 			 void (*hook)(void *user_param,
+ 				      unsigned int N,
+@@ -194,6 +196,7 @@
+  * then bliss_permute() with the returned canonical labeling.
+  * Note that the computed canonical version may depend on the applied version
+  * of bliss.
++ * Returns NULL if insufficient memory or internal error.
+  */
+ const unsigned int *
+ bliss_find_canonical_labeling(BlissGraph *graph,
+diff -Naur bliss-0.72.orig/defs.cc bliss-0.72/defs.cc
+--- bliss-0.72.orig/defs.cc	2013-04-28 14:35:20.582085167 -0600
++++ bliss-0.72/defs.cc	2013-04-28 14:36:28.792330603 -0600
+@@ -33,7 +33,6 @@
+   vfprintf(stderr, fmt, ap);
+   fprintf(stderr, "\nAborting!\n");
+   va_end(ap);
+-  exit(1);
+ }
+ 
+ }
+diff -Naur bliss-0.72.orig/graph.cc bliss-0.72/graph.cc
+--- bliss-0.72.orig/graph.cc	2013-04-28 14:35:20.582085167 -0600
++++ bliss-0.72/graph.cc	2013-04-28 14:37:16.162501050 -0600
+@@ -34,7 +34,10 @@
+ namespace bliss {
+ 
+ #define _INTERNAL_ERROR() fatal_error("%s:%d: internal error",__FILE__,__LINE__)
+-#define _OUT_OF_MEMORY() fatal_error("%s:%d: out of memory",__FILE__,__LINE__)
++#define _OUT_OF_MEMORY(label) do {				\
++    fatal_error("%s:%d: out of memory",__FILE__,__LINE__);	\
++    goto label;							\
++  } while (0)
+ 
+ /*-------------------------------------------------------------------------
+  *
+@@ -279,20 +282,6 @@
+     *perm = i;
+ }
+ 
+-bool
+-AbstractGraph::is_automorphism(unsigned int* const perm)
+-{
+-  _INTERNAL_ERROR();
+-  return false;
+-}
+-
+-bool
+-AbstractGraph::is_automorphism(const std::vector<unsigned int>& perm) const
+-{
+-  _INTERNAL_ERROR();
+-  return false;
+-}
+-
+ 
+ 
+ 
+@@ -608,17 +597,7 @@
+ };
+ 
+ 
+-
+-
+-typedef struct {
+-  unsigned int splitting_element;
+-  unsigned int certificate_index;
+-  unsigned int subcertificate_length;
+-  UintSeqHash eqref_hash;
+-} PathInfo;
+-
+-
+-void
++bool
+ AbstractGraph::search(const bool canonical, Stats& stats)
+ {
+   const unsigned int N = get_nof_vertices();
+@@ -658,7 +637,7 @@
+   if(N == 0)
+     {
+       /* Nothing to do, return... */
+-      return;
++      return true;
+     }
+ 
+   /* Initialize the partition ... */
+@@ -696,10 +675,10 @@
+    */
+   if(first_path_labeling) free(first_path_labeling);
+   first_path_labeling = (unsigned int*)calloc(N, sizeof(unsigned int));
+-  if(!first_path_labeling) _OUT_OF_MEMORY();
++  if(!first_path_labeling) _OUT_OF_MEMORY(oom1);
+   if(best_path_labeling) free(best_path_labeling);
+   best_path_labeling = (unsigned int*)calloc(N, sizeof(unsigned int));
+-  if(!best_path_labeling) _OUT_OF_MEMORY();
++  if(!best_path_labeling) _OUT_OF_MEMORY(oom2);
+ 
+   /*
+    * Is the initial partition discrete?
+@@ -710,7 +689,7 @@
+       update_labeling(best_path_labeling);
+       /* Update statistics */
+       stats.nof_leaf_nodes = 1;
+-      return;
++      return true;
+     }
+ 
+   /*
+@@ -718,20 +697,39 @@
+    */
+   if(first_path_labeling_inv) free(first_path_labeling_inv);
+   first_path_labeling_inv = (unsigned int*)calloc(N, sizeof(unsigned int));
+-  if(!first_path_labeling_inv) _OUT_OF_MEMORY();
++  if(!first_path_labeling_inv) _OUT_OF_MEMORY(oom3);
+   if(best_path_labeling_inv) free(best_path_labeling_inv);
+   best_path_labeling_inv = (unsigned int*)calloc(N, sizeof(unsigned int));
+-  if(!best_path_labeling_inv) _OUT_OF_MEMORY();
++  if(!best_path_labeling_inv) _OUT_OF_MEMORY(oom4);
+ 
+   /*
+    * Allocate space for the automorphisms
+    */
+   if(first_path_automorphism) free(first_path_automorphism);
+   first_path_automorphism = (unsigned int*)malloc(N * sizeof(unsigned int));
+-  if(!first_path_automorphism) _OUT_OF_MEMORY();
++  if(!first_path_automorphism) _OUT_OF_MEMORY(oom5);
+   if(best_path_automorphism) free(best_path_automorphism);
+   best_path_automorphism = (unsigned int*)malloc(N * sizeof(unsigned int));
+-  if(!best_path_automorphism) _OUT_OF_MEMORY();
++  if(!best_path_automorphism) {
++    _OUT_OF_MEMORY(oom6);
++  oom6:
++    free(first_path_automorphism);
++    first_path_automorphism = NULL;
++  oom5:
++    free(best_path_labeling_inv);
++    best_path_labeling_inv = NULL;
++  oom4:
++    free(first_path_labeling_inv);
++    first_path_labeling_inv = NULL;
++  oom3:
++    free(best_path_labeling);
++    best_path_labeling = NULL;
++  oom2:
++    free(first_path_labeling);
++    first_path_labeling = NULL;
++  oom1:
++    return false;
++  }
+ 
+   /*
+    * Initialize orbit information so that all vertices are in their own orbits
+@@ -745,7 +743,6 @@
+   initialize_certificate();
+ 
+   std::vector<TreeNode> search_stack;
+-  std::vector<PathInfo> first_path_info;
+   std::vector<PathInfo> best_path_info;
+ 
+   search_stack.clear();
+@@ -974,7 +971,6 @@
+        */
+       {
+ 	unsigned int  next_split_element = UINT_MAX;
+-	unsigned int* next_split_element_pos = 0;
+ 	unsigned int* ep = p.elements + cell->first;
+ 	if(current_node.fp_on)
+ 	  {
+@@ -985,7 +981,6 @@
+ 		 *ep < next_split_element and
+ 		 first_path_orbits.is_minimal_representative(*ep)) {
+ 		next_split_element = *ep;
+-		next_split_element_pos = ep;
+ 	      }
+ 	    }
+ 	  }
+@@ -1001,7 +996,6 @@
+ 		  current_node.long_prune_redundant.find(*ep) ==
+ 		  current_node.long_prune_redundant.end())) {
+ 		next_split_element = *ep;
+-		next_split_element_pos = ep;
+ 	      }
+ 	    }
+ 	  }
+@@ -1015,7 +1009,6 @@
+ 		  current_node.long_prune_redundant.find(*ep) ==
+ 		  current_node.long_prune_redundant.end())) {
+ 		next_split_element = *ep;
+-		next_split_element_pos = ep;
+ 	      }
+ 	    }
+ 	  }
+@@ -1203,8 +1196,10 @@
+ 
+ #if defined(BLISS_VERIFY_EQUITABLEDNESS)
+       /* The new partition should be equitable */
+-      if(!is_equitable())
++      if(!is_equitable()) {
+ 	fatal_error("consistency check failed - partition after refinement is not equitable");
++	return false;
++      }
+ #endif
+ 
+       /*
+@@ -1366,6 +1361,7 @@
+ 			  goto handle_first_path_automorphism;
+ 			/* Should never get here because of CR:FP */
+ 			_INTERNAL_ERROR();
++			return false;
+ 		      }
+ 		  }
+ 
+@@ -1598,8 +1594,10 @@
+ 	
+ #if defined(BLISS_VERIFY_AUTOMORPHISMS)
+ 	/* Verify that it really is an automorphism */
+-	if(!is_automorphism(best_path_automorphism))
++	if(!is_automorphism(best_path_automorphism)) {
+ 	  fatal_error("Best path automorhism validation check failed");
++	  return false;
++	}
+ #endif
+ 	
+ 	unsigned int gca_level_with_first = 0;
+@@ -1666,6 +1664,7 @@
+ 
+ 
+       _INTERNAL_ERROR();
++      return false;
+ 
+       
+     handle_first_path_automorphism:
+@@ -1701,8 +1700,10 @@
+ 
+ #if defined(BLISS_VERIFY_AUTOMORPHISMS)
+       /* Verify that it really is an automorphism */
+-      if(!is_automorphism(first_path_automorphism))
++      if(!is_automorphism(first_path_automorphism)) {
+ 	fatal_error("First path automorphism validation check failed");
++	return false;
++      }
+ #endif
+       
+       if(opt_use_long_prune)
+@@ -1749,12 +1750,13 @@
+   /* Release component recursion data in partition */
+   if(opt_use_comprec)
+     p.cr_free();
++  return true;
+ }
+ 
+ 
+ 
+ 
+-void
++bool
+ AbstractGraph::find_automorphisms(Stats& stats,
+ 				  void (*hook)(void *user_param,
+ 					       unsigned int n,
+@@ -1764,7 +1766,8 @@
+   report_hook = hook;
+   report_user_param = user_param;
+ 
+-  search(false, stats);
++  if (!search(false, stats))
++    return false;
+ 
+   if(first_path_labeling)
+     {
+@@ -1776,6 +1779,7 @@
+       free(best_path_labeling);
+       best_path_labeling = 0;
+     }
++  return true;
+ }
+ 
+ 
+@@ -1790,7 +1794,8 @@
+   report_hook = hook;
+   report_user_param = user_param;
+ 
+-  search(true, stats);
++  if (!search(true, stats))
++    return NULL;
+ 
+   return best_path_labeling;
+ }
+@@ -3480,15 +3485,17 @@
+  * Check whether perm is an automorphism.
+  * Slow, mainly for debugging and validation purposes.
+  */
+-bool
++int
+ Digraph::is_automorphism(unsigned int* const perm)
+ {
+   std::set<unsigned int, std::less<unsigned int> > edges1;
+   std::set<unsigned int, std::less<unsigned int> > edges2;
+ 
+ #if defined(BLISS_CONSISTENCY_CHECKS)
+-  if(!is_permutation(get_nof_vertices(), perm))
++  if(!is_permutation(get_nof_vertices(), perm)) {
+     _INTERNAL_ERROR();
++    return -1;
++  }
+ #endif
+ 
+   for(unsigned int i = 0; i < get_nof_vertices(); i++)
+@@ -3507,7 +3514,7 @@
+ 	  ei++)
+ 	edges2.insert(*ei);
+       if(!(edges1 == edges2))
+-	return false;
++	return 0;
+ 
+       edges1.clear();
+       for(std::vector<unsigned int>::iterator ei = v1.edges_out.begin();
+@@ -3520,10 +3527,10 @@
+ 	  ei++)
+ 	edges2.insert(*ei);
+       if(!(edges1 == edges2))
+-	return false;
++	return 0;
+     }
+ 
+-  return true;
++  return 1;
+ }
+ 
+ bool
+@@ -4330,8 +4337,10 @@
+ Graph::permute(const unsigned int* perm) const
+ {
+ #if defined(BLISS_CONSISTENCY_CHECKS)
+-  if(!is_permutation(get_nof_vertices(), perm))
++  if(!is_permutation(get_nof_vertices(), perm)) {
+     _INTERNAL_ERROR();
++    return NULL;
++  }
+ #endif
+ 
+   Graph* const g = new Graph(get_nof_vertices());
+@@ -5270,15 +5279,17 @@
+  *
+  *-------------------------------------------------------------------------*/
+ 
+-bool
++int
+ Graph::is_automorphism(unsigned int* const perm)
+ {
+   std::set<unsigned int, std::less<unsigned int> > edges1;
+   std::set<unsigned int, std::less<unsigned int> > edges2;
+ 
+ #if defined(BLISS_CONSISTENCY_CHECKS)
+-  if(!is_permutation(get_nof_vertices(), perm))
++  if(!is_permutation(get_nof_vertices(), perm)) {
+     _INTERNAL_ERROR();
++    return -1;
++  }
+ #endif
+ 
+   for(unsigned int i = 0; i < get_nof_vertices(); i++)
+@@ -5298,10 +5309,10 @@
+ 	edges2.insert(*ei);
+ 
+       if(!(edges1 == edges2))
+-	return false;
++	return 0;
+     }
+ 
+-  return true;
++  return 1;
+ }
+ 
+ 
+@@ -5444,7 +5455,7 @@
+   component.clear();
+   component_elements = 0;
+   sh_return = 0;
+-  unsigned int sh_first  = 0;
++  unsigned int sh_first  = 1 << 31;
+   unsigned int sh_size   = 0;
+   unsigned int sh_nuconn = 0;
+ 
+diff -Naur bliss-0.72.orig/graph.hh bliss-0.72/graph.hh
+--- bliss-0.72.orig/graph.hh	2013-04-28 14:35:20.582085167 -0600
++++ bliss-0.72/graph.hh	2013-04-28 14:37:16.162501050 -0600
+@@ -109,9 +109,12 @@
+   unsigned long int get_max_level() const {return max_level;}
+ };
+ 
+-
+-
+-
++typedef struct {
++  unsigned int splitting_element;
++  unsigned int certificate_index;
++  unsigned int subcertificate_length;
++  UintSeqHash eqref_hash;
++} PathInfo;
+ 
+ 
+ /**
+@@ -270,7 +273,7 @@
+   void reset_permutation(unsigned int *perm);
+ 
+   /* Mainly for debugging purposes */
+-  virtual bool is_automorphism(unsigned int* const perm);
++  virtual int is_automorphism(unsigned int* const perm) = 0;
+ 
+   std::vector<unsigned int> certificate_current_path;
+   std::vector<unsigned int> certificate_first_path;
+@@ -284,7 +287,11 @@
+   virtual Partition::Cell* find_next_cell_to_be_splitted(Partition::Cell *cell) = 0;
+ 
+ 
+-  void search(const bool canonical, Stats &stats);
++  /**
++   * \return true if successful, false if insufficient memory to complete or
++   * other internal error
++   */
++  bool search(const bool canonical, Stats &stats);
+ 
+ 
+   void (*report_hook)(void *user_param,
+@@ -351,7 +358,7 @@
+    */
+   unsigned int cr_component_elements;
+ 
+-
++  std::vector<PathInfo> first_path_info;
+ 
+ 
+ public:
+@@ -362,7 +369,7 @@
+    * Check whether \a perm is an automorphism of this graph.
+    * Unoptimized, mainly for debugging purposes.
+    */
+-  virtual bool is_automorphism(const std::vector<unsigned int>& perm) const;
++  virtual bool is_automorphism(const std::vector<unsigned int>& perm) const = 0;
+ 
+ 
+ 
+@@ -427,8 +434,10 @@
+    * if you want to use the automorphism later, you have to take a copy of it.
+    * Do not call any member functions in the hook.
+    * The search statistics are copied in \a stats.
++   * \return true if successful, false if insufficient memory to search or
++   * other internal error.
+    */
+-  void find_automorphisms(Stats& stats,
++  bool find_automorphisms(Stats& stats,
+ 			  void (*hook)(void* user_param,
+ 				       unsigned int n,
+ 				       const unsigned int* aut),
+@@ -448,6 +457,8 @@
+    * Note that the computed canonical version may depend on the applied version
+    * of bliss as well as on some other options (for instance, the splitting
+    * heuristic selected with bliss::Graph::set_splitting_heuristic()).
++   * This function returns NULL if there is insufficient memory, or another
++   * internal error occurs.
+    */
+   const unsigned int* canonical_form(Stats& stats,
+ 				     void (*hook)(void* user_param,
+@@ -500,6 +511,10 @@
+     opt_use_long_prune = active;
+   }
+ 
++  /**
++   * Get an information vector about the first path.
++   */
++  std::vector<PathInfo> get_first_path_info() { return first_path_info; }
+ };
+ 
+ 
+@@ -615,7 +630,7 @@
+ 
+   void initialize_certificate();
+   
+-  bool is_automorphism(unsigned int* const perm);
++  int is_automorphism(unsigned int* const perm);
+ 
+ 
+   bool nucr_find_first_component(const unsigned int level);
+@@ -856,7 +871,7 @@
+ 
+   void initialize_certificate();
+ 
+-  bool is_automorphism(unsigned int* const perm);
++  int is_automorphism(unsigned int* const perm);
+ 
+   void sort_edges();
+ 
diff --git a/sci-libs/bliss/metadata.xml b/sci-libs/bliss/metadata.xml
new file mode 100644
index 000000000000..a86587f981d2
--- /dev/null
+++ b/sci-libs/bliss/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<maintainer>
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
index 9ac15932373c..6ce6dc0d77fa 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.11 2014/10/12 14:46:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.12 2015/03/09 13:35:48 jlec Exp $
 
 EAPI=3
 
@@ -23,7 +23,7 @@ SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
 # patch tarball from upstream
 	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
 # patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
 
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r12.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r12.ebuild
deleted file mode 100644
index 7ef561290595..000000000000
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r12.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r12.ebuild,v 1.3 2014/10/12 14:46:08 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-#UPDATE="04_03_09"
-#PATCHDATE="090511"
-
-MY_P="${P/-libs}"
-
-PATCH_TOT="0"
-
-DESCRIPTION="Protein X-ray crystallography toolkit - Libraries"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
-# patch tarball from upstream
-	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
-# patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccp4-6.1.3
-	!<sci-chemistry/ccp4-apps-${PV}-r10
-	app-shells/tcsh
-	dev-lang/tcl
-	>=sci-libs/cbflib-0.9.2.2
-	sci-libs/fftw:2.1
-	sci-libs/mmdb:0
-	sci-libs/monomer-db
-	sci-libs/ssm
-	virtual/jpeg
-	virtual/lapack
-	virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	tc-export PKG_CONFIG RANLIB AR
-
-	sed \
-		-e "/^AR/s:ar:$(tc-getAR):g" \
-		-i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die
-
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd "${dir}" >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	[[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
-	einfo "Applying Gentoo patches ..."
-	# fix buffer overflows wrt bug 339706
-	ccp_patch "${FILESDIR}"/${PV}-overflows.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
-
-	# make creation of libccif.so smooth
-	ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
-
-	# lets try to build libmmdb seperatly
-	ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
-
-	# unbundle libjpeg and cbflib
-	ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch
-
-	# Fix missing DESTIDR
-	# not installing during build
-	ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
-	sed \
-		-e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
-		-i configure || die
-
-	# Fix upstreams code
-	ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
-
-	# use pkg-config to detect BLAS/LAPACK
-	ccp_patch "${FILESDIR}"/${PV}-lapack.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-cbf.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-no-pypath.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	# not needed, we have it extra
-	rm -rf src/rapper/{libxml2,gc7.0} || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e 's:-Wl,-rpath,$CLIB::g' \
-		-e 's: -rpath $CLIB::g' \
-		-e 's: -I${srcdir}/include/cpp_c_headers::g' \
-		-e 's:sleep 1:sleep .2:g' \
-		-i configure || die
-
-	gnuconfig_update
-
-	for i in lib/DiffractionImage src/rapper src/pisa; do
-		pushd ${i} > /dev/null
-			sed 's:-g::g' -i configure* || die
-			eautoreconf
-		popd > /dev/null
-	done
-
-	## unbundle libssm
-	sed -e '/libdir/s:ssm::g' -i Makefile.in || die
-	find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die
-}
-
-src_configure() {
-	rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
-
-	# Build system is broken if we set LDFLAGS
-	userldflags="${LDFLAGS}"
-	export SHARED_LIB_FLAGS="${LDFLAGS}"
-	unset LDFLAGS
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup || die
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure || die
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-
-	export SHARE_LIB="\
-		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
-		$(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		--onlylibs \
-		--with-shared-libs \
-		--with-fftw="${EPREFIX}/usr" \
-		--with-warnings \
-		--disable-cctbx \
-		--disable-clipper \
-		--disable-ssm \
-		--tmpdir="${TMPDIR}" \
-		--bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		${GENTOO_OSNAME} || die "configure failed"
-}
-
-src_compile() {
-	emake DESTDIR="${D}" onlylib
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	emake \
-		DESTDIR="${D}" \
-		includedir="${EPREFIX}/usr/include" \
-		library_includedir="${EPREFIX}/usr/include" \
-		install
-
-	sed \
-		-e "330,1000d" \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	sed \
-		-e "378,1000d" \
-		-i "${S}"/include/ccp4.setup-csh || die
-
-	sed \
-		-e "s:-${PV/-r*/}::g" \
-		-e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*export CLIBS=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CLIBS \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CLIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CLIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \
-		-e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \
-		-e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \
-		-e "/CCP4_HELPDIR/d" \
-		-e "/IMOSFLM_VERSION/d" \
-		-i "${S}"/include/ccp4.setup* || die
-
-	# Don't check for updates on every sourcing of /etc/profile
-	sed -i \
-		-e "s:\(eval python.*\):#\1:g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file}
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file}
-		fi
-	done
-
-	prune_libtool_files
-
-	sed \
-		-e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	# Setup scripts
-	insinto /etc/profile.d
-	newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh
-	newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh
-	rm -f "${S}"/include/ccp4.setup*
-
-	# Data
-	insinto /usr/share/ccp4/data/
-	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures}
-
-	# Environment files, setup scripts, etc.
-	rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
-	insinto /usr/share/ccp4/
-	doins -r "${S}"/include
-
-	dodoc "${S}"/lib/data/*.doc
-	newdoc "${S}"/lib/data/README DATA-README
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild
deleted file mode 100644
index a5e63e29a737..000000000000
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r13.ebuild,v 1.3 2014/10/12 14:46:08 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-#UPDATE="04_03_09"
-#PATCHDATE="090511"
-
-MY_P="${P/-libs}"
-
-PATCH_TOT="0"
-
-DESCRIPTION="Protein X-ray crystallography toolkit - Libraries"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
-# patch tarball from upstream
-	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
-# patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccp4-6.1.3
-	!<sci-chemistry/ccp4-apps-${PV}-r10
-	app-shells/tcsh
-	dev-lang/tcl
-	>=sci-libs/cbflib-0.9.2.2
-	sci-libs/fftw:2.1
-	sci-libs/mmdb:0
-	sci-libs/monomer-db
-	sci-libs/ssm
-	virtual/jpeg
-	virtual/lapack
-	virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	tc-export PKG_CONFIG RANLIB AR
-
-	sed \
-		-e "/^AR/s:ar:$(tc-getAR):g" \
-		-i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die
-
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd "${dir}" >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	[[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
-	einfo "Applying Gentoo patches ..."
-	# fix buffer overflows wrt bug 339706
-	ccp_patch "${FILESDIR}"/${PV}-overflows.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
-
-	# make creation of libccif.so smooth
-	ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
-
-	# lets try to build libmmdb seperatly
-	ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
-
-	# unbundle libjpeg and cbflib
-	ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch
-
-	# Fix missing DESTIDR
-	# not installing during build
-	ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
-	sed \
-		-e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
-		-i configure || die
-
-	# Fix upstreams code
-	ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
-
-	# use pkg-config to detect BLAS/LAPACK
-	ccp_patch "${FILESDIR}"/${PV}-lapack.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-cbf.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-no-pypath.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	# not needed, we have it extra
-	rm -rf src/rapper/{libxml2,gc7.0} || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e 's:-Wl,-rpath,$CLIB::g' \
-		-e 's: -rpath $CLIB::g' \
-		-e 's: -I${srcdir}/include/cpp_c_headers::g' \
-		-e 's:sleep 1:sleep .2:g' \
-		-i configure || die
-
-	gnuconfig_update
-
-	for i in lib/DiffractionImage src/rapper src/pisa; do
-		pushd ${i} > /dev/null
-			sed 's:-g::g' -i configure* || die
-			eautoreconf
-		popd > /dev/null
-	done
-
-	## unbundle libssm
-	sed -e '/libdir/s:ssm::g' -i Makefile.in || die
-	find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die
-}
-
-src_configure() {
-	rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
-
-	# Build system is broken if we set LDFLAGS
-	userldflags="${LDFLAGS}"
-	export SHARED_LIB_FLAGS="${LDFLAGS}"
-	unset LDFLAGS
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup || die
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure || die
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-
-	export SHARE_LIB="\
-		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
-		$(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		--onlylibs \
-		--with-shared-libs \
-		--with-fftw="${EPREFIX}/usr" \
-		--with-warnings \
-		--disable-cctbx \
-		--disable-clipper \
-		--disable-ssm \
-		--tmpdir="${TMPDIR}" \
-		--bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		${GENTOO_OSNAME} || die "configure failed"
-}
-
-src_compile() {
-	emake DESTDIR="${D}" onlylib
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	emake \
-		DESTDIR="${D}" \
-		includedir="${EPREFIX}/usr/include" \
-		library_includedir="${EPREFIX}/usr/include" \
-		install
-
-	sed \
-		-e "330,1000d" \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	sed \
-		-e "378,1000d" \
-		-i "${S}"/include/ccp4.setup-csh || die
-
-	sed \
-		-e "s:-${PV/-r*/}::g" \
-		-e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \
-		-e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \
-		-e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \
-		-e '/CLIB=/d' \
-		-e '/CLIB /d' \
-		-e '/CLIBS=/d' \
-		-e '/CLIBS /d' \
-		-e "/alias/d" \
-		-e "/CCP4_HELPDIR/d" \
-		-e "/IMOSFLM_VERSION/d" \
-		-i "${S}"/include/ccp4.setup* || die
-
-	# Don't check for updates on every sourcing of /etc/profile
-	sed -i \
-		-e "s:\(eval python.*\):#\1:g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file}
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file}
-		fi
-	done
-
-	prune_libtool_files
-
-	sed \
-		-e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	# Setup scripts
-	insinto /etc/profile.d
-	newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh
-	newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh
-	rm -f "${S}"/include/ccp4.setup*
-
-	# Data
-	insinto /usr/share/ccp4/data/
-	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures}
-
-	# Environment files, setup scripts, etc.
-	rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
-	insinto /usr/share/ccp4/
-	doins -r "${S}"/include
-
-	dodoc "${S}"/lib/data/*.doc
-	newdoc "${S}"/lib/data/README DATA-README
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r14.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r14.ebuild
deleted file mode 100644
index 4cf29537697e..000000000000
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r14.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r14.ebuild,v 1.2 2014/10/12 14:46:08 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-#UPDATE="04_03_09"
-#PATCHDATE="090511"
-
-MY_P="${P/-libs}"
-
-PATCH_TOT="0"
-
-DESCRIPTION="Protein X-ray crystallography toolkit - Libraries"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
-# patch tarball from upstream
-	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
-# patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-for i in $(seq $PATCH_TOT); do
-	NAME="PATCH${i}[1]"
-	SRC_URI="${SRC_URI}
-		${SRC}/${PV}/patches/${!NAME}"
-done
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!<sci-chemistry/ccp4-6.1.3
-	!<sci-chemistry/ccp4-apps-${PV}-r10
-	app-shells/tcsh
-	dev-lang/tcl
-	>=sci-libs/cbflib-0.9.2.2
-	sci-libs/fftw:2.1
-	sci-libs/mmdb:0
-	sci-libs/monomer-db
-	sci-libs/ssm
-	virtual/jpeg
-	virtual/lapack
-	virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	tc-export PKG_CONFIG RANLIB AR
-
-	sed \
-		-e "/^AR/s:ar:$(tc-getAR):g" \
-		-i lib/src/Makefile.in src/Makefile.in src/ccp4mapwish_/Makefile.in lib/ccif/Makefile.in || die
-
-	einfo "Applying upstream patches ..."
-	for patch in $(seq $PATCH_TOT); do
-		base="PATCH${patch}"
-		dir=$(eval echo \${${base}[0]})
-		p=$(eval echo \${${base}[1]})
-		pushd "${dir}" >& /dev/null
-		ccp_patch "${DISTDIR}/${p}"
-		popd >& /dev/null
-	done
-	einfo "Done."
-	echo
-
-	[[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
-	einfo "Applying Gentoo patches ..."
-	# fix buffer overflows wrt bug 339706
-	ccp_patch "${FILESDIR}"/${PV}-overflows.patch
-
-	# it tries to create libdir, bindir etc on live system in configure
-	ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
-
-	# gerror_ gets defined twice on ppc if you're using gfortran/g95
-	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
-
-	# make creation of libccif.so smooth
-	ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
-
-	# lets try to build libmmdb seperatly
-	ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
-
-	# unbundle libjpeg and cbflib
-	ccp_patch "${FILESDIR}"/${PV}-unbundle-libs-ng2.patch
-
-	# Fix missing DESTIDR
-	# not installing during build
-	ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
-	sed \
-		-e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
-		-i configure || die
-
-	# Fix upstreams code
-	ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
-
-	# use pkg-config to detect BLAS/LAPACK
-	ccp_patch "${FILESDIR}"/${PV}-lapack.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-cbf.patch
-
-	# proto type changing in version 0.9.2.2
-	ccp_patch "${FILESDIR}"/${PV}-no-pypath.patch
-
-	einfo "Done." # done applying Gentoo patches
-	echo
-
-	# not needed, we have it extra
-	rm -rf src/rapper/{libxml2,gc7.0} || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e 's:-Wl,-rpath,$CLIB::g' \
-		-e 's: -rpath $CLIB::g' \
-		-e 's: -I${srcdir}/include/cpp_c_headers::g' \
-		-e 's:sleep 1:sleep .2:g' \
-		-i configure || die
-
-	gnuconfig_update
-
-	for i in lib/DiffractionImage src/rapper src/pisa; do
-		pushd ${i} > /dev/null
-			sed 's:-g::g' -i configure* || die
-			eautoreconf
-		popd > /dev/null
-	done
-
-	## unbundle libssm
-	sed -e '/libdir/s:ssm::g' -i Makefile.in || die
-	find ./lib/src/mmdb ./lib/ssm ./lib/clipper ./lib/fftw lib/lapack -delete || die
-}
-
-src_configure() {
-	rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
-
-	# Build system is broken if we set LDFLAGS
-	userldflags="${LDFLAGS}"
-	export SHARED_LIB_FLAGS="${LDFLAGS}"
-	unset LDFLAGS
-
-	# GENTOO_OSNAME can be one of:
-	# irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
-	# linux_compaq_compilers linux_intel_compilers generic Darwin
-	# ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
-	if [[ "$(tc-getFC)" = "ifort" ]]; then
-		if use ia64; then
-			GENTOO_OSNAME="ia64_linux_intel"
-		else
-			# Should be valid for x86, maybe amd64
-			GENTOO_OSNAME="linux_intel_compilers"
-		fi
-	else
-		# Should be valid for x86 and amd64, at least
-		GENTOO_OSNAME="linux"
-	fi
-
-	# Sets up env
-	ln -s \
-		ccp4.setup-bash \
-		"${S}"/include/ccp4.setup || die
-
-	# We agree to the license by emerging this, set in LICENSE
-	sed -i \
-		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure || die
-
-	# Fix up variables -- need to reset CCP4_MASTER at install-time
-	sed -i \
-		-e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \
-		-e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
-		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
-	export COPTIM=${CFLAGS}
-	export CXXOPTIM=${CXXFLAGS}
-	# Default to -O2 if FFLAGS is unset
-	export FC=$(tc-getFC)
-	export FOPTIM=${FFLAGS:- -O2}
-
-	export SHARE_LIB="\
-		$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
-		$(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $($(tc-getPKG_CONFIG) --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
-
-	# Can't use econf, configure rejects unknown options like --prefix
-	./configure \
-		--onlylibs \
-		--with-shared-libs \
-		--with-fftw="${EPREFIX}/usr" \
-		--with-warnings \
-		--disable-cctbx \
-		--disable-clipper \
-		--disable-ssm \
-		--tmpdir="${TMPDIR}" \
-		--bindir="${EPREFIX}/usr/libexec/ccp4/bin/" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		${GENTOO_OSNAME} || die "configure failed"
-}
-
-src_compile() {
-	emake DESTDIR="${D}" onlylib
-}
-
-src_install() {
-	# Set up variables for build
-	source "${S}"/include/ccp4.setup-sh
-
-	emake \
-		DESTDIR="${D}" \
-		includedir="${EPREFIX}/usr/include" \
-		library_includedir="${EPREFIX}/usr/include" \
-		install
-
-	sed \
-		-e "330,1000d" \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	sed \
-		-e "378,1000d" \
-		-i "${S}"/include/ccp4.setup-csh || die
-
-	sed \
-		-e "s:-${PV/-r*/}::g" \
-		-e "s:^\(.*export CCP4_MASTER=\).*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4_MASTER\).*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4=\).*CCP4_MASTER.*:\1${EPREFIX}/usr:g" \
-		-e "s:^\(.*setenv CCP4\).*CCP4_MASTER.*:\1 ${EPREFIX}/usr:g" \
-		-e "s:^\(.*export CCP4_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv CCP4_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export BINSORT_SCR=\).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*setenv BINSORT_SCR \).*:\1${EPREFIX}/tmp:g" \
-		-e "s:^\(.*export CCP4I_TOP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*setenv CCP4I_TOP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i:g" \
-		-e "s:^\(.*export CCP4I_TCLTK=\).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*setenv CCP4I_TCLTK \).*:\1${EPREFIX}/usr/bin:g" \
-		-e "s:^\(.*export CCP4I_HELP=\).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*setenv CCP4I_HELP \).*:\1${EPREFIX}/usr/$(get_libdir)/ccp4/ccp4i/help:g" \
-		-e "s:^\(.*export CBIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CBIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CCP4_BIN=\).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*setenv CCP4_BIN \).*:\1${EPREFIX}/usr/libexec/ccp4/bin:g" \
-		-e "s:^\(.*export CLIBD_MON=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv CLIBD_MON \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CLIBD=\).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*setenv CLIBD \).*:\1${EPREFIX}/usr/share/ccp4/data:g" \
-		-e "s:^\(.*export CCP4_LIB=\).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*setenv CCP4_LIB \).*:\1${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(.*export CCP4_BROWSER=\).*:\1firefox:g" \
-		-e "s:^\(.*setenv CCP4_BROWSER \).*:\1firefox:g" \
-		-e "s:^\(.*export MANPATH=\).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*setenv MANPATH \).*:\1\${MANPATH}:g" \
-		-e "s:^\(.*export DBCCP4I_TOP=\).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*setenv DBCCP4I_TOP \).*:\1${EPREFIX}/usr/share/ccp4/dbccp4i:g" \
-		-e "s:^\(.*export MOLREPLIB=\).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*setenv MOLREPLIB \).*:\1${EPREFIX}/usr/share/ccp4/data/monomers/:g" \
-		-e "s:^\(.*export CDOC=\).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*setenv CDOC \).*:\1${EPREFIX}/usr/share/doc:g" \
-		-e "s:^\(.*export CEXAM=\).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*setenv CEXAM \).*:\1${EPREFIX}/usr/share/doc/examples:g" \
-		-e "s:^\(.*export CINCL=\).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e "s:^\(.*setenv CINCL \).*:\1${EPREFIX}/usr/share/ccp4/include:g" \
-		-e "s:\$CLIB/font84.dat:\"${EPREFIX}/usr/$(get_libdir)/font84.dat\":g" \
-		-e '/# .*LD_LIBRARY_PATH specifies/,/^$/d' \
-		-e '/CLIB=/d' \
-		-e '/CLIB /d' \
-		-e '/CLIBS=/d' \
-		-e '/CLIBS /d' \
-		-e "/alias/d" \
-		-e "/CCP4_HELPDIR/d" \
-		-e "/IMOSFLM_VERSION/d" \
-		-i "${S}"/include/ccp4.setup* || die
-
-	# Don't check for updates on every sourcing of /etc/profile
-	sed -i \
-		-e "s:\(eval python.*\):#\1:g" \
-		"${S}"/include/ccp4.setup* || die
-
-	# Libs
-	for file in "${S}"/lib/*; do
-		if [[ -d ${file} ]]; then
-			continue
-		elif [[ -x ${file} ]]; then
-			dolib.so ${file}
-		else
-			insinto /usr/$(get_libdir)
-			doins ${file}
-		fi
-	done
-
-	prune_libtool_files
-
-	sed \
-		-e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
-		-i "${S}"/include/ccp4.setup-sh || die
-
-	# Setup scripts
-	insinto /etc/profile.d
-	newins "${S}"/include/ccp4.setup-csh 40ccp4.setup.csh
-	newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh
-	rm -f "${S}"/include/ccp4.setup*
-
-	# Data
-	insinto /usr/share/ccp4/data/
-	doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures}
-
-	# Environment files, setup scripts, etc.
-	rm -rf "${S}"/include/{ccp4.setup*,COPYING,cpp_c_headers} || die
-	insinto /usr/share/ccp4/
-	doins -r "${S}"/include
-
-	dodoc "${S}"/lib/data/*.doc
-	newdoc "${S}"/lib/data/README DATA-README
-}
-
-pkg_postinst() {
-	einfo "The Web browser defaults to firefox. Change CCP4_BROWSER"
-	einfo "in ${EPREFIX}/etc/profile.d/40ccp4.setup* to modify this."
-}
-
-# Epatch wrapper for bulk patching
-ccp_patch() {
-	EPATCH_SINGLE_MSG="  ${1##*/} ..." epatch ${1}
-}
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r15.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r15.ebuild
index 95be2810d6d4..a23602876a35 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r15.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r15.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r15.ebuild,v 1.2 2014/10/12 14:46:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r15.ebuild,v 1.3 2015/03/09 13:35:48 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools eutils fortran-2 gnuconfig multilib python-single-r1 toolchain-funcs
 
@@ -23,7 +23,7 @@ SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
 # patch tarball from upstream
 	[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
 # patches created by us
-	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+	[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
 
 for i in $(seq $PATCH_TOT); do
 	NAME="PATCH${i}[1]"
@@ -49,7 +49,7 @@ RDEPEND="
 	sci-libs/mmdb:0
 	sci-libs/monomer-db
 	sci-libs/ssm
-	virtual/jpeg
+	virtual/jpeg:0=
 	virtual/lapack
 	virtual/blas"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/exodusii/exodusii-6.02.ebuild b/sci-libs/exodusii/exodusii-6.02.ebuild
index 11177bbff606..152d9fac1dcb 100644
--- a/sci-libs/exodusii/exodusii-6.02.ebuild
+++ b/sci-libs/exodusii/exodusii-6.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/exodusii/exodusii-6.02.ebuild,v 1.3 2015/03/06 22:47:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/exodusii/exodusii-6.02.ebuild,v 1.4 2015/03/09 00:05:49 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 DEPEND="sci-libs/netcdf[hdf5]"
diff --git a/sci-libs/monomer-db/monomer-db-0.090729.ebuild b/sci-libs/monomer-db/monomer-db-0.090729.ebuild
index cb18f9c9d58a..12ee2b19b285 100644
--- a/sci-libs/monomer-db/monomer-db-0.090729.ebuild
+++ b/sci-libs/monomer-db/monomer-db-0.090729.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/monomer-db/monomer-db-0.090729.ebuild,v 1.9 2011/10/25 06:06:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/monomer-db/monomer-db-0.090729.ebuild,v 1.10 2015/03/09 13:39:22 jlec Exp $
+
+EAPI=5
 
 DESCRIPTION="Monomer library used for macromolecular structure building and refinement"
 HOMEPAGE="http://www.ccp4.ac.uk/"
 # SRC_URI="http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac_dictionary.tar.gz"
-SRC_URI="http://dev.gentooexperimental.org/~jlec/science-dist/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~jlec/science-dist/${P}.tar.gz"
 
 LICENSE="ccp4"
 SLOT="0"
@@ -22,7 +24,8 @@ S="${WORKDIR}"/dic
 src_install() {
 	insinto /usr/share/ccp4/data/monomers/
 	for i in {a..z} {1..9} *list *.cif *.txt; do
-		doins -r ${i} || die
+		doins -r ${i}
 	done
-	dohtml *.html || die
+	docinto html
+	dodoc *.html
 }
diff --git a/sci-libs/vtk/vtk-6.1.0-r1.ebuild b/sci-libs/vtk/vtk-6.1.0-r1.ebuild
index c5570b79b6ef..6e3859f039a1 100644
--- a/sci-libs/vtk/vtk-6.1.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-6.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.6 2015/03/06 22:47:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.7 2015/03/09 00:05:43 pacho Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ SRC_URI="
 	"
 
 LICENSE="BSD LGPL-2"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="
 	all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi
diff --git a/sci-libs/vtkdata/vtkdata-6.1.0.ebuild b/sci-libs/vtkdata/vtkdata-6.1.0.ebuild
index c7c60ebf01de..8c9988ab2cdb 100644
--- a/sci-libs/vtkdata/vtkdata-6.1.0.ebuild
+++ b/sci-libs/vtkdata/vtkdata-6.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtkdata/vtkdata-6.1.0.ebuild,v 1.4 2015/03/06 22:47:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtkdata/vtkdata-6.1.0.ebuild,v 1.5 2015/03/09 00:05:53 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.vtk.org/files/release/$(get_version_component_range 1-2)/VTK
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
index 172d17b3df6b..860012ed613d 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild,v 1.4 2015/03/06 22:47:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild,v 1.5 2015/03/09 00:06:04 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="VTK"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc python test"
 
 RDEPEND="
diff --git a/sci-libs/xkaapi/xkaapi-2.2.ebuild b/sci-libs/xkaapi/xkaapi-2.2.ebuild
index ca98ed98aab0..0fe87e130701 100644
--- a/sci-libs/xkaapi/xkaapi-2.2.ebuild
+++ b/sci-libs/xkaapi/xkaapi-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xkaapi/xkaapi-2.2.ebuild,v 1.2 2015/03/06 22:47:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xkaapi/xkaapi-2.2.ebuild,v 1.3 2015/03/09 00:05:57 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/${UPSTREAM_NO}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="CeCILL-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="blas cxx fortran gpu openmp static-libs"
 
 RDEPEND="
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index 254f2950383b..04965ec17b84 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -1 +1,2 @@
-DIST nauty24r2.tar.gz 720754 SHA256 760f9cca43b8eb7dd083983ea0e137125ee8a181d460c970137cfb7490fe1621
+DIST nauty24r2.tar.gz 720754 SHA256 760f9cca43b8eb7dd083983ea0e137125ee8a181d460c970137cfb7490fe1621 SHA512 19b998e0e385ee2b111b7085f64ab28c8d985337a097407c14dc7d5f1b279e1176e3e708f282d82f8364ef77562c0f978f00b3f965501f528ebedbe9bf7c5545 WHIRLPOOL 1fc9fc228274181bf3fb26b53d2e6e7faef0431e5ce90b631c65437ae103afeaee879d78051548dcad1da58410c2d357fee0912cc7f14b8764cc605423677e15
+DIST nauty25r9.tar.gz 1007323 SHA256 602d0e2e5ab1bdc84ab69f75ebc065833501bd2875cb07b1bb4274e3dd632825 SHA512 79f9054f1d39406063f4cbab61002b27f260b93fd37d6346efdfcd113c59ebab54320e6e7b6cdf26c7eddc376e4ad558e2cd4e6071d418dce2a6918f3c8f7ca2 WHIRLPOOL 0dcce5a74ac5874c5a510cd0d302b5d73897ee3cfaa208945de464e057a4b0af2ba4e717e8d331c51d5065d45363a339e0cd746a0a8fda179ec616b1443e2f63
diff --git a/sci-mathematics/nauty/metadata.xml b/sci-mathematics/nauty/metadata.xml
index 0c5be24442aa..186d7a91db3c 100644
--- a/sci-mathematics/nauty/metadata.xml
+++ b/sci-mathematics/nauty/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>tomka@gentoo.org</email>
-  <name>Thomas Kahle</name>
-</maintainer>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <maintainer>
+    <email>tomka@gentoo.org</email>
+    <name>Thomas Kahle</name>
+  </maintainer>
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
 nauty is a program for computing automorphism groups of graphs and digraphs. It can also produce a
 canonical labelling.
 
diff --git a/sci-mathematics/nauty/nauty-2.5.9.ebuild b/sci-mathematics/nauty/nauty-2.5.9.ebuild
new file mode 100644
index 000000000000..fd11ad7114d3
--- /dev/null
+++ b/sci-mathematics/nauty/nauty-2.5.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nauty/nauty-2.5.9.ebuild,v 1.1 2015/03/09 10:29:25 jlec Exp $
+
+EAPI=5
+
+inherit versionator
+
+MY_PV=$(replace_version_separator 2 'r')
+MY_PV=$(delete_version_separator 1 ${MY_PV})
+
+DESCRIPTION="Computing automorphism groups of graphs and digraphs"
+HOMEPAGE="http://pallini.di.uniroma1.it/"
+SRC_URI="http://cs.anu.edu.au/~bdm/${PN}/${PN}${MY_PV}.tar.gz"
+
+LICENSE="nauty"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}${MY_PV}"
+
+src_prepare () {
+	sed \
+		-e "s/^LDFLAGS=.*/LDFLAGS=${LDFLAGS}/" \
+		-e 's:${CC} -o:${CC} ${LDFLAGS} -o:g' \
+		-e 's:${LDFLAGS}$::g' \
+		-i makefile.in || die
+}
+
+src_test () {
+	emake checks
+	./runalltests
+}
+
+src_install () {
+	dobin addedgeg amtog biplabg catg complg copyg countg \
+		deledgeg directg dreadnaut dretog genbg geng genrang \
+		gentourng labelg listg multig newedgeg NRswitchg pickg \
+		planarg shortg showg
+	dodoc README formats.txt nug*.pdf
+}
diff --git a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
index 07f3a2f24db4..0c20b28ef687 100644
--- a/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
+++ b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.12.2.ebuild,v 1.2 2015/03/01 12:22:49 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.12.2.ebuild,v 1.3 2015/03/09 11:45:56 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.mathematik.uni-osnabrueck.de/${PN}/Normaliz${PV}/Normaliz${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc extras openmp"
 
 RDEPEND="dev-libs/gmp[cxx]"
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 3903d93cb725..6d7beb859000 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,2 +1,4 @@
 DIST Singular-3-1-6-share.tar.gz 10620177 SHA256 c74a97b7eb8ed53417682637fe11c2480aeb1a6cbf4a8db27a1b16a162e83c4d SHA512 54bff29c5d64609583ec8b1c43005a1ff453c8f2cedfe9a26ac840888e9d306e3104e14aea5a3cc923fac916215c4285ecfe5ae7e1242aee0308b5e4c6e2d48d WHIRLPOOL a1edc8fa9cad189af413870b0e63316e135e8456075f13b3d8036afafd6c25f4bcc854432cdcb8c2ec690c63b43f616367aa9f1027c096e95f22aa0508943f67
 DIST Singular-3-1-6.tar.gz 25535111 SHA256 7956a17a0b5d428fea25bc0bc6c19c753748fb98bb2926c49b9fbcbec94172ff SHA512 103a10dd474d93cceb678bcef1a4aae5ec693cb9e68c9d63a7536929b738a0127501ee145a79cc3b9ddfa4bd1ca0f05e640eeb3b0fbdb60de4f56aa5beacc213 WHIRLPOOL 71ef6d505f7c8b2eeacd46666640d7b3c79f75d6c2c858b135553b1fb3a9dd7d88df74924009468c32aa4aa748b88ccb7762010ab4d36eec420a07fd36e8dd22
+DIST singular-4.0.2-share.tar.gz 8789162 SHA256 fe81cb100f3b73b159eb4a8122a29bc0f7705ef6f62ad55b68b5582c1ec0642d SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25 WHIRLPOOL 615487e95e32d9f07552e92ebcd46e3071d110dd31e7d980b01340d22a5205ba2d771532fad1bf44863a38820428157284a171e0b901861fda6e51482d546adc
+DIST singular-4.0.2.tar.gz 8635172 SHA256 c105a2c8ace0b3c9189b782ed63660ce235407d0160907c2cafc2128d36d8cb7 SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d WHIRLPOOL fe30bc87c6b403b2e30bd1c016aeeb015c2a64a63d87b81536dc53a2555ac068f3e0c6d8763775d8be5e5e1a935aadab1c86b603cbb698234a19cc9cfffac282
diff --git a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
new file mode 100644
index 000000000000..87b44234af5f
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
@@ -0,0 +1,12 @@
+diff -U 3 -dHrN singular-4.0.0.orig/omalloc/configure.ac singular-4.0.0/omalloc/configure.ac
+--- singular-4.0.0.orig/omalloc/configure.ac	2014-03-06 18:07:49.000000000 +0100
++++ singular-4.0.0/omalloc/configure.ac	2014-05-09 15:41:19.755097185 +0200
+@@ -117,7 +117,7 @@
+ dnl check for programs
+ dnl
+ AC_CHECK_PROG(AR, ar, ar, :)
+-if test "$ac_cv_prog_AR" != ar; then
++if test "$ac_cv_prog_AR" = no; then
+   AC_MSG_ERROR(*** ar program not found)
+ fi
+ AC_CHECK_PROGS(PERL, perl, "no")
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
new file mode 100644
index 000000000000..e55836950aad
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-4.0.2.ebuild,v 1.1 2015/03/09 13:49:39 tomka Exp $
+
+EAPI=5
+
+inherit autotools eutils elisp-common flag-o-matic multilib prefix versionator
+
+MY_PN=Singular
+MY_PV=$(replace_all_version_separators '.')
+# Consistency is different...
+MY_DIR2=$(get_version_component_range 1-3 ${PV})
+MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
+# This is where the share tarball unpacks to
+MY_SHARE_DIR="${WORKDIR}"/share/
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="http://www.singular.uni-kl.de/"
+SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
+		 http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos"
+IUSE="boost doc emacs examples python +readline"
+
+RDEPEND="dev-libs/gmp
+	>=dev-libs/ntl-5.5.1
+	emacs? ( >=virtual/emacs-22 )
+	sci-mathematics/flint
+	sci-mathematics/4ti2"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	boost? ( dev-libs/boost )
+	readline? ( sys-libs/readline )"
+
+SITEFILE=60${PN}-gentoo.el
+
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+pkg_setup() {
+	append-flags "-fPIC"
+	append-ldflags "-fPIC"
+	tc-export AR CC CPP CXX
+
+	# Ensure that >=emacs-22 is selected
+	if use emacs; then
+		elisp-need-emacs 22 || die "Emacs version too low"
+	fi
+}
+
+src_prepare () {
+	# Need to do something about resources later...
+	# epatch "${FILESDIR}"/${PN}-4.0.0-gentoo.patch
+
+	# omalloc's old configure will fail if ar is not exactly 'ar'.
+	epatch "${FILESDIR}"/${PN}-4.0.0-fix-omalloc-ar-detection.patch
+
+	cd "${S}"/omalloc || die "failed to cd into omalloc directory"
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-gmp \
+		  --with-ntl \
+		  --with-flint \
+		  --enable-gfanlib \
+		  --disable-debug \
+		  --disable-doc \
+		  --enable-factory \
+		  --enable-libfac \
+		  --enable-IntegerProgramming \
+		  $(use_with python python embed) \
+		  $(use_with boost Boost) \
+		  $(use_enable emacs) \
+		  $(use_with readline) || die "configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use emacs; then
+		cd "${MY_SHARE_DIR}"singular/emacs/
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+# src_install () {
+# 	dodoc README
+# 	# execs and libraries
+# 	cd "${S}"/build/bin
+# 	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \
+# 		|| die "failed to install binaries"
+# 	insinto /usr/$(get_libdir)/${PN}
+# 	doins *.so || die "failed to install libraries"
+#
+# 	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} \
+# 		|| die "failed to create symbolic link"
+#
+# 	# stuff from the share tar ball
+# 	cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
+# 	insinto /usr/share/${PN}
+# 	doins -r LIB  || die "failed to install lib files"
+# 	if use examples; then
+# 		insinto /usr/share/doc/${PF}
+# 		doins -r examples || die "failed to install examples"
+# 	fi
+# 	if use doc; then
+# 		dohtml -r html/* || die "failed to install html docs"
+# 		insinto /usr/share/${PN}
+# 		doins doc/singular.idx || die "failed to install idx file"
+# 		cp info/${PN}.hlp info/${PN}.info &&
+# 		doinfo info/${PN}.info \
+# 			|| die "failed to install info files"
+# 	fi
+# 	if use emacs; then
+# 		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \
+# 			|| die "elisp-install failed"
+# 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+# 	fi
+# }
+
+pkg_postinst() {
+	einfo "The authors ask you to register as a SINGULAR user."
+	einfo "Please check the license file for details."
+
+	if use emacs; then
+		echo
+		ewarn "Please note that the ESingular emacs wrapper has been"
+		ewarn "removed in favor of full fledged singular support within"
+		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
+		ewarn "and you should be good to go! See bug #193411 for more info."
+		echo
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..a64537e31fe0
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.4-r1.ebuild,v 1.1 2015/03/09 00:36:52 prometheanfire Exp $
+
+EAPI=5
+
+inherit eutils multilib multilib-minimal prefix user
+
+DESCRIPTION="NSS module for name lookups using LDAP"
+HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
+SRC_URI="http://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug kerberos sasl +pam"
+
+DEPEND="
+	net-nds/openldap[${MULTILIB_USEDEP}]
+	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	pam? ( virtual/pam[${MULTILIB_USEDEP}] )
+	!sys-auth/nss_ldap
+	!sys-auth/pam_ldap"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup nslcd
+	enewuser nslcd -1 -1 -1 nslcd
+}
+
+src_prepare() {
+	# support user patches
+	epatch_user
+}
+
+multilib_src_configure() {
+	# nss libraries always go in /lib on Gentoo
+	myconf="
+		--enable-warnings
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file=/etc/nslcd.conf
+		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
+		--with-nslcd-socket=/run/nslcd/socket
+		$(use_enable debug)
+		$(use_enable kerberos)
+		$(use_enable pam)
+		$(use_enable sasl)"
+
+	if multilib_is_native_abi ; then
+		myconf+=" --with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security"
+		myconf+=" --libdir=${EPREFIX}/$(get_libdir)"
+	else
+		myconf+=" --with-pam-seclib-dir=/$(get_libdir)/security"
+		myconf+=" --libdir=/$(get_libdir)"
+	fi
+
+	if use x86-fbsd; then
+		myconf+=" --with-nss-flavour=freebsd"
+	else
+		myconf+=" --with-nss-flavour=glibc"
+	fi
+
+	ECONF_SOURCE=${S} econf ${myconf}
+}
+
+multilib_src_install_all() {
+	# for socket and pid file (not needed bug 452992)
+	#keepdir /run/nslcd
+
+	# init script
+	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
+
+	# make an example copy
+	insinto /usr/share/nss-pam-ldapd
+	doins nslcd.conf
+
+	fperms o-r /etc/nslcd.conf
+}
+
+pkg_postinst() {
+	echo
+	elog "For this to work you must configure /etc/nslcd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	echo
+	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	echo
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
+	elog
+	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
+	elog " is now named /etc/nslcd.conf"
+	echo
+}
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 27d28b4d1c83..df0d6faa9600 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,31 +1,6 @@
 DIST fio-1.17.2.tar.bz2 1155486 SHA256 1bf40fb709b7e7dbee778139cabae6b70ec6a89a43ddd83450a6b981bf813498 SHA512 99ea0da474f2d23d17a4c8775d1ec0421c020f072e2ccfbf920cbf52edac934e365dac38cdbd15993dfa72dd09b81540b0b9802f1896f031e8682fdfd805ee4b WHIRLPOOL 61da7007e3b591b148f3ffba45c3c1ecf646c47ad08d78c258cdca2906c441285fa0db738e5b0b0113a00ed178d99973b5b380a03690fe5d2e279a361cea0201
-DIST fio-1.17.tar.bz2 1107885 SHA256 b536582f1355bf959350746dad5abab26ca646065eef84cf4b08d990726b26d4 SHA512 fdb2991470701af98974c7d29a079266791ef0069ad18937d8df56523ba10c7ec963acc958917c20a6aa9563f33579156a7151cc414f92f6b90636fa3ac5ef62 WHIRLPOOL c2b8689f627abe7bec101e2a698256d223542d7bfe61e4e22a048652900b905fced8a1988b2fe4b12e2a82d22b998f252aab68a2b62f5562e2b6461a7880ab7b
-DIST fio-1.18.1.tar.bz2 1206690 SHA256 5dc37a82b8bb8cd3c75d9fc5e135fd0cb313e19f6c1be5690ace365de990d4bb SHA512 fde9ab9804062281d7b7240a374bcdc4bd72b691c3b04af735bd2361690ccb3eff2876c92a87b526ee82a720f196c78b9f5c1dd0aee4a41c5c685fe16d0660ea WHIRLPOOL d0a7e0b37ba44056709e4f9004785c40f8b167e0a53dad6d948ed9c0c48a073e9826e64448894f0e705c9fac1869421829d4698c831fa7226f0cf2cafb89aeb8
-DIST fio-1.20.tar.bz2 1262996 SHA256 06b1be8720117c099d0828f77edc14865aff6b080a7189d31c23aa863e563597 SHA512 b28741e6a53a955b8369a46d5bd5350350872e8d72065af6598e00395e1a06a88683c38f9b22630de073a89557935da4c5800f741cb028d761977834197d03bc WHIRLPOOL e5e88dc818c403a70e560b6697cee902c9cee22f25384c534b473bb131c6dc3baf5cf4136dd36b245fc69c6b07435878429a0f9efac2b5060f3fc090fd062895
-DIST fio-1.21-rc3.tar.bz2 1294439 SHA256 1d31f93aca0e5cbc18988ad46a3e4815915b01d4bc1119633f0c38161a12570c SHA512 2bfb8e3bbc717fefe84eeb41b2a611783a86a2261f0f51e9042d623774801f4abc79065d8c5550cc910afac9772a59a74490bee639653636a873e54345ec42f3 WHIRLPOOL e5d22b1c560cf7aa42ee7e19cb9b5ff7505ab8bb96756affa78500ef911de6c3965e0f3ce70f493719e53401be872f08c76b411a74ac96fbd5b7f4ddacd533ed
-DIST fio-1.21.tar.bz2 1353714 SHA256 9a172f1cc9de63cdead9eb6730785f20ea577e1137edd05e2d079bdeaa9c5ee9 SHA512 19a8941bcade4fcd1017508af996c8b02f68469a60ef9ac9249312e09d094a61d044e6bdda6b4c2303aa979ffb6c0767c3f7d8f15678651b786be49a8724a4ab WHIRLPOOL 720278121cc7d2bcc0177c06b8a6c70e9539ce83c252f8db9152711ad72f127c1cb69bae76fd17b8769bfd4cab8b127d92a29cadc137284fbe964ca5315cde64
-DIST fio-1.22.tar.bz2 1402137 SHA256 e8d887481c1f6aac675d230f25a999ccfcf4de4c8fba0adf1b8a464d54a275f1 SHA512 bd9815b43994b0bef1006096aca3fbc74827f01576f63213a41b050383f21737a68767808f7f3d5ed5cdd091c6835b385e65006a66e0c90ce5f94b363793e74a WHIRLPOOL 1aa7bfc30d97f5d47b40caa8b0bfba27a7297c279a48f9ee4a5b5f7872f0cc6439488a33947c2008873f246b70ef6e7ce4c06e262aaf567359d6f20259c5cb31
-DIST fio-1.23.tar.bz2 1423595 SHA256 cfed0bfe86c70ace90017ec9b9279f5c577b8d4a8810507f3d6f865784676e07 SHA512 6a34d0d7eca5af14f7589ddd07ff176439495f5d5db18d8e8bc2168ce9a722836124b1e668c28a38a7e5bd1221f130e199ca964aeb6d95588e951651fac29bde WHIRLPOOL 8c8992e8e049f8381e939e6ed7ea6ae4e354959ecc0e8168d981455eb7df9413a5820d113afed067a432a2d2a854bb67701ce0a00d10a7cb8ebc918b2ecd019f
-DIST fio-1.25.1.tar.bz2 1473395 SHA256 fbc77c82fc5cfc1b8e6901cd139baa1e6cb018cdab2c1a089a5928359bb76f81 SHA512 3d7e8e2d0d965b4293ea3f4812bd3cc93069a6cde791fd04a7cf31ce170f5e9b66a7b54c6cb4bc451fb5dbe50de8fe228b934d44cb320d27f6c621c0eef212fd WHIRLPOOL 5157b5b448e14db8c91a222c4ce5937e648644affb756b1bc84ad12450a337d6fa172417a26692b4573e9af79a7c73632a61266111740fd1e7af1b4d99cbe21a
-DIST fio-1.34.tar.bz2 141735 SHA256 c30a934e797ec15724d895a3c953342d26e7d3f72cadd8fefaceee2b72ceb92b SHA512 483ba04085185ff87323a3e206713ac2f9f658eacc4ffdfe1a3ea154bb30ee66ae28e408192a3fdaafccf56b88d4f5fb447201e7d21f900ae70899d01c751b9f WHIRLPOOL a56eb4d98cfd075979ed738d97c9f24f5e4f8dca8abe7053dac21f4840be07c84369b9a7df4606afabe3035d9c259423ea093e0d9c6c4778d98614103bb0783c
-DIST fio-1.50-rc4.tar.bz2 342805 SHA256 c33993b4f0bf44c65751a8e27934f5275d2a64d1f61171e889b6cf9651af70a7 SHA512 ac836c1a1b0a58b7f3cb9c43613a2e4f86284ce0925bcef635fcb658ccf61c4d99bd9efba1e304ee197937f8ad373d998cd623519c7b915a3408699d45b8613c WHIRLPOOL eb94dc129df08d98f68ce3645a4d79e4d4b333c7c61b33f676c92524b49de801d15e68adb6bcaea845072c8217beb3612b61d5962e89627aee0c6dc8e73be887
-DIST fio-1.58.tar.bz2 354895 SHA256 c1477f68183c7dd892218a1e2bfab8c21b98c01bf9b724694291325914042207 SHA512 b0f3c1c8a95fcc018e33e829add8f0c1d418b17c95ea7e7a87b08da551a1086b430899191ba1bc366046430f34ec96105e6f7156f6a0ed796174209b247a10f5 WHIRLPOOL 8c82f21ac56c8fc117eb2bbab6bccc815659e91d88e5018cc4450b61022cd6fe4dd34938fb3465da01443d70fbe55061bba89fa7e00f2208ca0165f20950bc7d
 DIST fio-1.99.10.tar.bz2 371892 SHA256 c6af6f685dfaa32c1f5779497f8d1b3dc1e18fc54bf35f0f3bb8120cf4ac2b3a SHA512 23bc2eaeed310d092a84cac06c701ccbe7c4ec45d98323f2e5ab3e4ccbea4b901edf2099dba1aed6fb31254c177228369e5983622a078ac33dc947a532693d87 WHIRLPOOL a4727121239f592f75f1a118f63370ee811c8f8b4396a253debd5ccc8a92641624d6bee65fb9b6c882e5dde41e5144d66457f47fef79942117a1a865f7183075
-DIST fio-2.0.10.tar.bz2 229363 SHA256 2de56c8b6103858d34c1771e244907fafe59788d7114930aa9f4fefc146954f0 SHA512 e8f25da93a9e9dbe4b2aa4689a208215688fbf78444cd1809eb3b783fbdc06bc770f1937a267c5f37663cbc8e5e723ad217dddd64e1d608adc26abe5625475bf WHIRLPOOL be46ea01f9d99923c506340ae7aee24864eb0304473cbb8238c7e8efdf8200967b48a0176afedbe2cfe27b8759283989d69266b4d8ed14f67bb3b2780314ce4a
-DIST fio-2.0.13.tar.bz2 244540 SHA256 c4ba9aceda6b3fd2335e8579ee653a3d94735e143de498e61f4168c413de809a SHA512 99e5f5acdf9c5e5643d0e3b5f86adaea62898d807ecc3e291b548d8922487d4eeeba1264bb432cb970be60d855e85bda5fbfa62f7dc98e52d76d6ec12b70ad2a WHIRLPOOL 4cbe4edbc7a91d970fe8d20a5c348f6df020fefd459d724cc2744e3b95d567ece8881d1be134d391681c8b174af8403701f403bf26e2f0a6b31302618aad833d
 DIST fio-2.0.14.tar.bz2 253574 SHA256 4bf01f1d2baf6d4fa905e5489e446e85e01979c427b2c38e2915e039248044e5 SHA512 f58024aeb38026e62cfec5a3ec9ceffb0bd1361a65cf89513a36615aa084974461c7f132ae803d49f02c36d36a6029c52f851e7f8b2cd1c66be0dcdc9fdcf115 WHIRLPOOL cb4812b34a59df41dfc6e293518becfe43515fa228b3dcb1400af987f465d7c1251b9d2645395fb7f2991728a67133bc1f1b0124db88963a1d9b11b29d949e26
 DIST fio-2.0.15.tar.bz2 258773 SHA256 3cc1b5e6c6955f9acad016b4d2ef619061ad9937874c7663e2a29777ed845ac4 SHA512 00289a0404cb44dd670614856932fbdf61cb1508e0eb672e5778c2ba3eba661b82892f7c969e4a82cf4fc487a744eb7411bfebf3b9612863de0197a28787f556 WHIRLPOOL 08b37573b63f812ea62c4ba323f05f510a9656e74f780117bd711bcc78e7fc7b5bef009212e7ec98f0ed153cc3786ece4d75d565845c0bc5eaba59afa1b037d8
-DIST fio-2.0.3.tar.bz2 373972 SHA256 5cba2bfe5f9ad23d2a1e2be5c63898ac5566e309f6fe5fb75c346b00e179efdd SHA512 fd984c1b9ee3e9939bd3f950b0f6a95e71cf65f11a618232b1e7dc33752739d3b0a8bbc1036f6c126a225c0dbfc925766701c717909e2c32c8aaaf026f7462e1 WHIRLPOOL 7c306af9ee44ce615bc4ebeaa13773e301fa3e77a875db21aefa3dcd7542b8a042c79faa27c169a364fd0d9c33a2f6cee06405b12a87c9fb2d72f7164e77cf81
-DIST fio-2.0.8.tar.bz2 216417 SHA256 584724a98cbed7364a550c9106c88d1ae3833b3edffda46ed5fcbb90fffb672a SHA512 ae254e4a2ea1a17052c9c2de6e6707c6254a80dd96c29a74c88d85808f1aa471e1ef2dd0a558114814b7813daedfabf4d38eb1bf875791d186b08eaeaecfe9e4 WHIRLPOOL 0350893fb7b097ae6ef902134f77fed078ae54be29e5c8c3108467c1d4dffb87e96d75fb365473c80f5f9b36b63a5fdc135bf0dd3f5f45f358081adc191a5df8
-DIST fio-2.0.9.tar.bz2 217972 SHA256 46c44757f489ffa89fa4566baba93c9f2efdc584029f1106d0c04ee900a8993a SHA512 c8be33477e3735170de9b91da3af8de32680e5e6e96728f0664aab21156e59f24a2508f6d2966b316c01e89f4932e0cdcbd9ef3c22067b76f81dd48e56dd6fc3 WHIRLPOOL 4e9313a75b56c925b58fd9dd19d4148e9643661ee63bfd7dfca89c669f42c9fc58d91bdcfaf62b5761a44a189c9c11555456557d76069ffdc80f935ea4584d84
-DIST fio-2.1.10.tar.bz2 432787 SHA256 4dd98cfe7da343b82ce351dd2a12f9ea456f9a54efc80a380786956a68c4edfc SHA512 207e4dc2c3f2d39dda6d901e38baa7a4e40ab0c2b7af074d4d7c24e72ca6859a43d6a10a1de8ab0953a82234d114762bcb53c4adf12cd12f748b3c4aa3e02914 WHIRLPOOL faecbe02ccad8b8cb982a25bfd0aec0f410c90761c3add1f0f99b0fc0973ab8ebdf6da4914ce5683fe4127c3ee9475b57216844f53194dcc955176a98054079c
-DIST fio-2.1.11.tar.bz2 438440 SHA256 aba2d8bac1997277cb9bb5a0abab345248298d4c0c712d484c3d2fab0674dbb1 SHA512 af6bb8038abbb704e21d183189f625ac321d651ff7a7027cc7f05095fb41671482c74903e08e4a5fb6ab5658b98371822580c62220a59333405ec26294a6104b WHIRLPOOL f06ee4ef948af1b74a8b365937838af13f4069c8d09a899edcc6b69d085fe9e197bf9824b9fd983bd1be4e0d1c7f5167b5cd8c96dbfce728980c78857aa31a14
-DIST fio-2.1.14.tar.bz2 464442 SHA256 98f7c375c7b1c9f9b5e02578e858437059bc9bfa0db8edaa800a37dc5b21d854 SHA512 b6e8f81ca05d1c0441cd6d0a3e97d472e11697cb3aecb381f07901e81328e966a79bd3cb4ef42cdae9d1f04405fb667c026cd64d14afa8d67a3c78fe7b267213 WHIRLPOOL cc0303c5c8d34d4dd2a34b16700c652b0866216e1da56595eed3bd8776447d70eecdb5f8459629b54149cec4966df0d3742129f5e37513f0c53a007f64b38b92
-DIST fio-2.1.2.tar.bz2 403177 SHA256 ebebbdfb6035369a6e5c960527a3ec77e96cd6c35cd3cfda058d76b7f15d2729 SHA512 39e67fce877f971ca86ce95f318bd582b481b52a679435279aa0fb44c9b099660010d8f8855c82df522f2a7a9519002feb395d4693139b4785a1b40dba898df7 WHIRLPOOL 398a9581c6efaf750b33a9043f602ef2421834d24782572cacb6ff63597ced5016b7bbc1d4e18ab04728a8716763fca53b97245a6c2e0d50147c3742f94da72d
-DIST fio-2.1.4.tar.bz2 407430 SHA256 62e075862340513fcdb1f75ccee3765a47d1f380f7a6bdb2175f24acf4b77467 SHA512 5dd12c298a715012761554a2239548571052d0655e51a142d6cc87f62e0daf0a007dafd61c7d0c1a7c45cb2ca1670493caa70bb056254e1bb9ebb86b75f7f556 WHIRLPOOL 82014ef1b9e6e9c87e532a66a19f98c229cdb165e38802679da5a869bfa5be9e7872d30cfda464bd3cf66cdfc459cb7a1dbdb9c9f909c6f9c10e6e8569abb038
-DIST fio-2.1.5.tar.bz2 413595 SHA256 8cb8a6599c223ba7a3f9b7fe817a9ca2b3c8512be89c64cc223f1951f3b19d26 SHA512 3e37ab487d8c97a31c752b9f5b70ca32632d7ba871db9d3501ef1528bb5e2f40d0d698ed13fbafa2ca59166a332d5984c4f14118a91f2fe1a32d2d682d9495c0 WHIRLPOOL b86a1d689cb49c0ecd1640fb1313f5662f00fa36a0bdafe301e745c7ccfa6fd89d8967049080d4e365bf45f39574019775aac199cf26dabfd20dcee6b7974e0c
-DIST fio-2.1.6.1.tar.bz2 425743 SHA256 fc64ac4f7f83bf9be0776fb66f10b8be0bd716d5979754242f016f36c9a751d8 SHA512 9fe6684e439b87cef22a9eb90319611f6a0be25dfe5d45c7686de9f64d649e32c57b6d3639955a9b71ee3bcc033e5654f378af9e9fff1da37328a7a45c6e9865 WHIRLPOOL 3572a83899b0e3413a4fb26f99d4c1716949673298586b35f2e0611a6fa6301cb2f62057d9a539f1a985ccb504bfcf509fb53a2f731e038f48d1ba0d2511816b
-DIST fio-2.1.7.tar.bz2 425743 SHA256 1e35db08337ea090cb5c6b91d6666882ba640bc6826fa67cd6116c6e46bb5def SHA512 ecc4a30eaf87afe42289b362fe0b5cbf7da9580d11766d322ba8f42e74766055ea5f91f295486979d81a743824b6b6d6134c947e14a7dde260ca47a3bebbbfd3 WHIRLPOOL 5d4e2ff6d4c7d255444c85a132cecd57607c14d3ac62f5b72bc5218a970fc1eb2e1207984113e0aed140e59640c1527c2b80e0fc58943609c1c266213d36e5e8
-DIST fio-2.1.8.tar.bz2 427983 SHA256 b35eb8309c22ecc4148e4ac608f22b9140638e36cf98c238cb7d5776cd16db16 SHA512 d9937838867d079318bfac7014f04f3e6f4b55b09bea6f92c914fa1ffc99cf2aeaed2b7f964be4daad08271675a70e0aa887703f17eb45e4d9f3d8d586c5a5c0 WHIRLPOOL 61b021f671961fff1e25259ea786332543f4956223c921cb7f634ae9243121daec1372f9e5a0c04188e139c619f6d2bc7d93da98ffab3cefb240468a7aafdc9e
 DIST fio-2.1.9.tar.bz2 429122 SHA256 4ae877939a1a1460ad4d93f7891a15bad8ca7295f441204b12c723758a0d4493 SHA512 91913941c0d83705c156eef550eb87b388368804ee722c8c99ea638481ee657960e333c58b54e720034e92c2c34e9a8bb901336399a209a87f5eaa1ad1dfde53 WHIRLPOOL 6f44cbfe601f436b1ed0173e1dfbcf3b342f1a191c947392f0167a2dba9c4806fa422ffaedf9475f83b49fab8832aa1076ba91d27a9f2bdbcae126fa4d708824
 DIST fio-2.2.4.tar.bz2 467312 SHA256 9e1c77216457d9e21e418a55fa28bc1f98c283723fe9dcccff6138e3fb25285b SHA512 91fa0d8f9dd8d950dd26ef5c778414acddd9d6deeb84caeecdfef08df7e00c7972566a76bd242b0d5aea33a7c588aa05cf2fdcd79ef5a475277a2139d1f111a1 WHIRLPOOL 4588601d5f44c1836f97cc223bf08cce3f29f5ea3421880c00a16dcd9e3cffd741bbdd2029518712f8808548469d7f44f1b0348189643419bfd2104eab980536
diff --git a/sys-block/fio/fio-1.17.ebuild b/sys-block/fio/fio-1.17.ebuild
deleted file mode 100644
index 4095f972fe5c..000000000000
--- a/sys-block/fio/fio-1.17.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.17.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-1.18.1.ebuild b/sys-block/fio/fio-1.18.1.ebuild
deleted file mode 100644
index 176591e17a6e..000000000000
--- a/sys-block/fio/fio-1.18.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.18.1.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-1.20.ebuild b/sys-block/fio/fio-1.20.ebuild
deleted file mode 100644
index 4d9cd0d78eb8..000000000000
--- a/sys-block/fio/fio-1.20.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.20.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.21.ebuild b/sys-block/fio/fio-1.21.ebuild
deleted file mode 100644
index c12ad5fd5661..000000000000
--- a/sys-block/fio/fio-1.21.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.21.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.21_rc3.ebuild b/sys-block/fio/fio-1.21_rc3.ebuild
deleted file mode 100644
index 31faa51532db..000000000000
--- a/sys-block/fio/fio-1.21_rc3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.21_rc3.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.22.ebuild b/sys-block/fio/fio-1.22.ebuild
deleted file mode 100644
index 636272c9bdb7..000000000000
--- a/sys-block/fio/fio-1.22.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.22.ebuild,v 1.3 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.23.ebuild b/sys-block/fio/fio-1.23.ebuild
deleted file mode 100644
index b4032df6b516..000000000000
--- a/sys-block/fio/fio-1.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.23.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.25.1.ebuild b/sys-block/fio/fio-1.25.1.ebuild
deleted file mode 100644
index 7d62aadb7e0b..000000000000
--- a/sys-block/fio/fio-1.25.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.25.1.ebuild,v 1.2 2014/08/05 01:16:05 robbat2 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.34.ebuild b/sys-block/fio/fio-1.34.ebuild
deleted file mode 100644
index a5d855929867..000000000000
--- a/sys-block/fio/fio-1.34.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.34.ebuild,v 1.4 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.50_rc4.ebuild b/sys-block/fio/fio-1.50_rc4.ebuild
deleted file mode 100644
index e6b73d2db373..000000000000
--- a/sys-block/fio/fio-1.50_rc4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.50_rc4.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-1.58.ebuild b/sys-block/fio/fio-1.58.ebuild
deleted file mode 100644
index d56ba9eec98c..000000000000
--- a/sys-block/fio/fio-1.58.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-1.58.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.10.ebuild b/sys-block/fio/fio-2.0.10.ebuild
deleted file mode 100644
index f7cb26aab56e..000000000000
--- a/sys-block/fio/fio-2.0.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.10.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.13.ebuild b/sys-block/fio/fio-2.0.13.ebuild
deleted file mode 100644
index ff51716ae359..000000000000
--- a/sys-block/fio/fio-2.0.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.13.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.14.ebuild b/sys-block/fio/fio-2.0.14.ebuild
deleted file mode 100644
index 5209ca8d4976..000000000000
--- a/sys-block/fio/fio-2.0.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.14.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		Makefile || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	: # not a real configure script
-	./configure --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)"
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.3.ebuild b/sys-block/fio/fio-2.0.3.ebuild
deleted file mode 100644
index e662f1fca4ee..000000000000
--- a/sys-block/fio/fio-2.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.3.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.8.ebuild b/sys-block/fio/fio-2.0.8.ebuild
deleted file mode 100644
index 663223800a80..000000000000
--- a/sys-block/fio/fio-2.0.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.8.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.9.ebuild b/sys-block/fio/fio-2.0.9.ebuild
deleted file mode 100644
index 4676feef84de..000000000000
--- a/sys-block/fio/fio-2.0.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.9.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.10-r1.ebuild b/sys-block/fio/fio-2.1.10-r1.ebuild
deleted file mode 100644
index 4df0f9d71b4f..000000000000
--- a/sys-block/fio/fio-2.1.10-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.10-r1.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch "${FILESDIR}"/${P}-json.patch
-	epatch_user
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	if use gnuplot ; then
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	else
-		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
-		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
-		rm "${ED}"/usr/share/fio/*.gpm || die
-		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.1.10.ebuild b/sys-block/fio/fio-2.1.10.ebuild
deleted file mode 100644
index 6372cd467b91..000000000000
--- a/sys-block/fio/fio-2.1.10.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.10.ebuild,v 1.4 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	if use gnuplot ; then
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	else
-		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
-		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
-		rm "${ED}"/usr/share/fio/*.gpm || die
-		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.1.11-r1.ebuild b/sys-block/fio/fio-2.1.11-r1.ebuild
deleted file mode 100644
index fb73d39beb57..000000000000
--- a/sys-block/fio/fio-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.11-r1.ebuild,v 1.4 2014/09/24 19:48:36 maekke Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	glusterfs? ( sys-cluster/glusterfs )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( sys-cluster/ceph )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	if use gnuplot ; then
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	else
-		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
-		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
-		rm "${ED}"/usr/share/fio/*.gpm || die
-		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.1.11.ebuild b/sys-block/fio/fio-2.1.11.ebuild
deleted file mode 100644
index ee02d2ad5811..000000000000
--- a/sys-block/fio/fio-2.1.11.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.11.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	if use gnuplot ; then
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	else
-		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
-		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
-		rm "${ED}"/usr/share/fio/*.gpm || die
-		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.1.2.ebuild b/sys-block/fio/fio-2.1.2.ebuild
deleted file mode 100644
index 47f3ed0add36..000000000000
--- a/sys-block/fio/fio-2.1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.2.ebuild,v 1.4 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		-e '/-o gfio/s/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot.py"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.4.ebuild b/sys-block/fio/fio-2.1.4.ebuild
deleted file mode 100644
index 97aba9c3e97c..000000000000
--- a/sys-block/fio/fio-2.1.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.4.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		-e '/-o gfio/s/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
-		Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.5.ebuild b/sys-block/fio/fio-2.1.5.ebuild
deleted file mode 100644
index 8153540cefd3..000000000000
--- a/sys-block/fio/fio-2.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.5.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.6.1.ebuild b/sys-block/fio/fio-2.1.6.1.ebuild
deleted file mode 100644
index 07318552ffe3..000000000000
--- a/sys-block/fio/fio-2.1.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.6.1.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.7.ebuild b/sys-block/fio/fio-2.1.7.ebuild
deleted file mode 100644
index 778ddec47652..000000000000
--- a/sys-block/fio/fio-2.1.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.7.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.8-r1.ebuild b/sys-block/fio/fio-2.1.8-r1.ebuild
deleted file mode 100644
index 249489b65e2b..000000000000
--- a/sys-block/fio/fio-2.1.8-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.8-r1.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	if use gnuplot ; then
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	else
-		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
-		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
-		rm "${ED}"/usr/share/fio/*.gpm || die
-		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.1.8.ebuild b/sys-block/fio/fio-2.1.8.ebuild
deleted file mode 100644
index bc77baaf3e03..000000000000
--- a/sys-block/fio/fio-2.1.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.8.ebuild,v 1.3 2014/09/07 17:42:56 robbat2 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="gtk"
-
-DEPEND="dev-libs/libaio
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS}" --cc="$(tc-getCC)" \
-		$(use gtk && echo "--enable-gfio") || die 'configure failed'
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.14.ebuild b/sys-block/fio/fio-2.2.4-r1.ebuild
similarity index 79%
rename from sys-block/fio/fio-2.1.14.ebuild
rename to sys-block/fio/fio-2.2.4-r1.ebuild
index c6d6bd852870..98cc28e03c21 100644
--- a/sys-block/fio/fio-2.1.14.ebuild
+++ b/sys-block/fio/fio-2.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.14.ebuild,v 1.2 2015/01/13 05:12:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.2.4-r1.ebuild,v 1.1 2015/03/09 01:10:34 prometheanfire Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -16,16 +16,18 @@ SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd zlib"
+IUSE="aio glusterfs gnuplot gtk numa rbd rdma zlib"
 
 DEPEND="aio? ( dev-libs/libaio )
-	glusterfs? ( sys-cluster/glusterfs )
+	glusterfs? ( !arm? ( sys-cluster/glusterfs ) )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:2
 	)
-	numa? ( sys-process/numactl )
-	rbd? ( sys-cluster/ceph )
+	numa? ( !arm? ( sys-process/numactl ) )
+	rbd? ( !arm? ( !ppc? ( sys-cluster/ceph ) ) )
+	rdma? ( !ppc? ( !ppc64? ( !ia64? ( !arm? (
+		sys-infiniband/librdmacm ) ) ) ) )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	gnuplot? (
@@ -44,6 +46,7 @@ src_prepare() {
 		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
 		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
 		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+		-e '/if compile_prog "" "-lrdmacm" "rdma" ; then/'"s::if $(usex rdma true false) ; then:" \
 		configure || die
 }
 
@@ -57,6 +60,7 @@ src_configure() {
 		$(usex gtk '--enable-gfio' '') \
 		$(usex numa '' '--disable-numa') \
 		$(usex rbd '' '--disable-rbd') \
+		$(usex rdma '' '--enable-rdma') \
 		|| die 'configure failed'
 }
 
diff --git a/sys-block/fio/fio-2.2.4.ebuild b/sys-block/fio/fio-2.2.4.ebuild
deleted file mode 100644
index 8dd04b354cda..000000000000
--- a/sys-block/fio/fio-2.2.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.2.4.ebuild,v 1.1 2015/01/13 05:12:43 prometheanfire Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	glusterfs? ( sys-cluster/glusterfs )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( sys-cluster/ceph )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	if use gnuplot ; then
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	else
-		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
-		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
-		rm "${ED}"/usr/share/fio/*.gpm || die
-		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/metadata.xml b/sys-block/fio/metadata.xml
index 17877aa398ca..76526f751f3b 100644
--- a/sys-block/fio/metadata.xml
+++ b/sys-block/fio/metadata.xml
@@ -13,5 +13,6 @@
 		<flag name="gnuplot">Install tools for generating gnuplots</flag>
 		<flag name="numa">Enable numa support</flag>
 		<flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="rdma">Enable infiniband support via <pkg>sys-infiniband/librdmacm</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 6d14b9f95bc4..77c2c246a35c 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -14,3 +14,4 @@ DIST aufs3-standalone-3_p20150119.tar.xz 2664080 SHA256 8758d15b49487e5339c61c4c
 DIST aufs3-standalone-3_p20150126.tar.xz 2726476 SHA256 8799abb92c27f7ba54f1119d16e50f4f6afd134e8e8510954f09ef96aaff3fb0 SHA512 238364ce5ad513a608d2aa9e22a1da69f6e9c7322e9450818366eebd48f998c2820dd30ab16c010da40de2ae992aef5d90d2883510b3798fcd0db882804751c2 WHIRLPOOL 113bc8316ab3eba8224450bc9b668b29b714104e115e67f286352658b4e998840889f0d99b396a43981d3d890bbeac97b100bf8a1878ddce4c83e9a5b7d6896e
 DIST aufs3-standalone-3_p20150216.tar.xz 2745548 SHA256 8687fde9e6670f7920767c2fb6450db44a8ef32fd3830d9c878b8695800ddd9e SHA512 116e1df3eed63f5d536f2b824975b9d3e0aa86b9b999789917bd71932b322bcbd5d98b19642793f6af84e5e81d65a3ae0d2c80376c386b8f1a6b349bdf607bb4 WHIRLPOOL bd57f126897b58d56e28e8a10a6bb8c932ff0fca2ac3fb8527fb685283fd14e876d372691ee8f2233aa3cba55b7c4cf14f996ccfb1e4b5c1623fa172ece7509b
 DIST aufs3-standalone-3_p20150223.tar.xz 2767600 SHA256 9bb4b5ff884a907876bc4236b2a4da9e8ec08b0395a24e0283dd5245a64e1068 SHA512 111bafeed3684168e4373c1655e14a91d76cfcfa6f5098788d3a12ec9a8b610709756d71928d5cfec43b3c93261aa28b2f34315809cf9ec4e3248e757b97ff09 WHIRLPOOL 356a1fdc98ace74c223c19c77b7acf13d1be12c0b46435878e2c3791891b89597660f64d0ad61c2e261bce90c1b641fd087ed079064ee13bf41b2c0c807a0f9b
+DIST aufs3-standalone-3_p20150309.tar.xz 2773040 SHA256 293cba514dc2b046d75ed4f092dabcdea707a4d23f2baccad62851140083aa0d SHA512 56a4e6a2d29e2ba9f24fe5213465d16956e0a3a22699fdab27881990c28e2e8f33d50e63996dc94714712f63fc34eff0fe069c1053acd2200e7c66e0ce2c6cb5 WHIRLPOOL 39c6f9347ed76de7e2430b6d57e8c54a85a4ce87834126e93692c1a41e3f213405d62eb11b05a5b29db6c1a817664735cf6b4599676f9b0649574549555f46f2
diff --git a/sys-fs/aufs3/aufs3-3_p20150309.ebuild b/sys-fs/aufs3/aufs3-3_p20150309.ebuild
new file mode 100644
index 000000000000..bff03e717627
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150309.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20150309.ebuild,v 1.1 2015/03/09 08:02:17 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=18
+# highest supported version
+KERN_MAX_VER=19
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+README_GENTOO_SUFFIX="-r1"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".12+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
index a92dbb8be415..e89cfe2f67bc 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.7 2015/03/05 08:04:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.8 2015/03/09 11:45:26 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="+xz lzma lz4 lzo xattr"
 
 RDEPEND="
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 86cc133f54ae..0bd994a0e352 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,7 +1,9 @@
 DIST aufs-sources-3.14.21+_p20150126.tar.xz 164864 SHA256 8343d8fefe0bf21e1dbff3114ee3a0994fe6968f564944aea7a96656387176f4 SHA512 1d4b1edbcd756b004237bee6ff6c7508e41d9d3d8dc0fd84f9facb6cd9aad2543adb0c5b8b2e6864ffc76470dd3ab4b38d586ef1320b1aef25beff2d0f9dfa84 WHIRLPOOL 35e239b2323a3ada6ff1ec26002927609418addbd1dfec20539de67e54b75edd71955ecd8718b030a4681722d0923d5a171dd65479930a03e50f1130fc35528b
+DIST aufs-sources-3.14.21+_p20150309.tar.xz 165212 SHA256 538ac677299237a12098c63c64e29fd3214e32a315f2aaae716fcb307aa0b673 SHA512 fc56231324dcaaa026eab226d31e0ec24f1f904bd4e67ec4d7e83602d5093ed6626f1940405a20f0e1f9a4dc0cdb3c29862dda93cda3754bc731d6eb56a16ea1 WHIRLPOOL 7bf618ac44098f182d7c4e2ea7766b3d993682f496fa6fb7d215cfeec182e5111acc478e3bc442f0f591b2160d08a8cbe8a2dd15e0f2137d9d6618d7c7542002
 DIST aufs-sources-3.17_p20150106.tar.xz 164980 SHA256 80b81108ac0ff7da54a5c6c3c2b5d941d0464b0cd5e1798ff2a05383a36dfcc4 SHA512 5114dc63d5d952b30f247b75c0ef02c62c9c1b7e11446654ec3897c2ad2c6b8f19e2f6fd95224e3dc3de923a199e67d7b6f2ade6cdfb5359e1f695b4a7edd21c WHIRLPOOL 51dcc7aa1ae06ccda5ae85fb594ad3432593fb74d84e951a1844e3d04e7ceb6e1f080999df8aa959f38dbe372d5fdf60659449944f67f98b85ceb6ef0b2a1a92
-DIST aufs-sources-3.18.1+_p20150126.tar.xz 164988 SHA256 51f1b25a3bd56a4c044d704d2eb997c2e51c555c4018d464ab1583049b2593e1 SHA512 f17a327143524c7a90076a03ae8c45655ddc5885b1ba2b3e4a29158e90b2f61fd674e517a4256153d9c6d1cf20ba6a511ec67cc53a6493b35fd4e72968217df6 WHIRLPOOL fb7d8e4e917105d3ac5dfe5003052eb0ecc298b6f0579caba9c73620ce42a524145d5692bebb6f60026d631aa2edde4ed2b8584f1be84cc1c0199bb4d3c921dd
+DIST aufs-sources-3.18.1+_p20150309.tar.xz 165344 SHA256 2d327e606588aa828540378ec648c5199e330af5e53ba273a1b615e6c523beef SHA512 b9ff4ced83bf8437b372b11dcc13987e9e470f5699c48406a465723329f6dbf1ea4efa7c4ea936478e63ce787e5a5707f81dd35e1d0558718f7686c64a27690f WHIRLPOOL 98b0b18d637f0412495708ce9dd90143f7bc3af7105cfc8f30a75fdda5bbf6e4c7472c53a07f586fa716a8ef5af94982355f826edb67f8501346e93ccbca8271
 DIST aufs-sources-3.19_p20150216.tar.xz 164816 SHA256 0152a53cc54940edc7d4a61b488c8977e020a89825339d9076d5a0f2b4f76e2f SHA512 9d61e265702b7b2545808a9172ad274769562a3be1b59124862fcd9436f98f0b4dc2240daaac1d5ee0e841e26affe843ec895f82170af4f196e04986912037ea WHIRLPOOL ced8a422da716fbbc7681dc7b442666ac2fa5339b45056bbea5b1f74f10532ffc15deb010c7a18d51b4927c98e82163cfe7948c65d3f475eebb64fad61350b29
+DIST aufs-sources-3.19_p20150309.tar.xz 165232 SHA256 d4f1633c005ce6b6a8ebf5188a8f67a71b608373bd7d5390beeb01a17cbf7aee SHA512 a665428e8f6eacf20dfae55aba22a33a6c81042c68005832988bc3421d5add094af7643ed037f7c2d36b4b8d03d5ae568dab06df0167ffb545dccddd0a455d9d WHIRLPOOL 6bc982c8c339820f3744caedc8a331bc7880d1b38861873d6030cc5d0a32e4be1a94908706e991717f4340ca570ca7edc2a059c1404b314ed3118f1f023bed20
 DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
 DIST deblob-3.17 127288 SHA256 93abf2894baf4d937ff2889fd1bdd04f1093bdb1321c79d8275e40f483e57ad1 SHA512 cb82b7cf59765991f74a1f5829cc6fb036a2e3466337b508884bcc5b27d7fef35db2e653cead705a37c7935c0bfb6bfeb1cdac7293de41994ee9c17ddca2ef39 WHIRLPOOL 0697a7bd39f270393814ffcbc746da6883e41fb32354223cdde8757b126d762bff55e69541c4d9ea0cc75093e19b73c4b6b09d98d9983e07b64fc4794615f2c8
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
@@ -10,24 +12,24 @@ DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647af
 DIST deblob-check-3.17 638139 SHA256 6ddbf2201595f0ba80166f44163621a4b14f508934c7dcc6c4f39573531aff71 SHA512 f9c60b21af2ee50db85a85329c0a5e3ecc5195ca6d9cc7d6bf499fcdb2eddf1454d99e30b91ce6062f484069ac2096da445643bdea8358c5ff1a79292a5947d6 WHIRLPOOL a0a15be3a48fabc56a782b0f6a92cb88520479d9f837e1de8b4bd2990b751e25f5a130542208f1c18b8f89c5a29edde846adb425834a640b6e188eee38bd98e4
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-3.19 659945 SHA256 df5a9b11b095b0d8c3204c9b24118d77689900fc4ef4c3256b13fe86aee0d185 SHA512 f7fc86ebc8e1c61c16d7ce6831368832862346522676b65f4702c77bb2e9b08691f2c67cf88e92929908d5300d53913e7e5365baf3378b1cbe3aca59ec80c672 WHIRLPOOL e5e33da007c07af4ca5713d583f992d9da8c6745761e1956a246de429a44aa972a94cc1db51e67d0ba1aad9b8476ef694d846e8157a85411bcbc1809f20f633a
-DIST genpatches-3.14-37.base.tar.xz 812644 SHA256 d61432fd1eb86a57078a543892b42f37c37a748d62f846aca198ce83b3f64a0c SHA512 e151448437e70255ddcea7cdfd053b95b38254463323b5a12bbc302608fefad215e9807e3fbb586bb41550e6a5c177bd0083edf8647b47c5ee20a513d70875f8 WHIRLPOOL a156ce6c4634ec02d5ab181fd913a55401aef3cec5697d1d431928da84fbe52261a3a1bab1bb69c91a382f57dd59dcbb759a63337ee44f3d7a8ad008631006c0
-DIST genpatches-3.14-37.experimental.tar.xz 60316 SHA256 b2790f1fea387ebd20249c938b27fbf460e7f1fc38374b8a26af13a66006c8c6 SHA512 4b3f0768a0997a8fb662622c65fae9f5b8ef267dd07a0ad7c715cf4ed73bca666f3ca0ac2f419617c8fb4431421d1d4ee8c1f890fa0c374c370751f9a9af2aaa WHIRLPOOL 88ecf663b13b85f4e46cf51222b62b4c8c2cbf2766c87673f10123d63df271a9b0110408f5d2b91f3eefd625b78c3b15e335e535deb44a09afd524fedaa9573f
-DIST genpatches-3.14-37.extras.tar.xz 18260 SHA256 d8bfc40e853fb63218b843730b13f6fb6ba74e1b6c29babf833f779e66662d62 SHA512 1cd49c02aef570818b6f77bffaadc10797955aedebb65272368567267bdadd55b984100d58e2a69dbd89afbced7c75bc42c0fbe7f588222e8dd6fba45be9728b WHIRLPOOL aff07a3f09ef89ad7fc9963dc5de08c8bb15529ef525bf588d83291cff14ba6d801513ef8531061e0dbab83c7083c73aa519091898b80676f44be57885df011c
 DIST genpatches-3.14-38.base.tar.xz 819288 SHA256 af1d91d3e068f13765b9f56a000a82dcfa6be0f0f3e92ba7598aa67383758c69 SHA512 44dfb6ecddb91131a343db9cfaaa55d43fcd49fa0b90813d78071dc31da4298cec51c7f452391ad675e2c1402e89cebb6e2346601e7bab953d27a2171edf0b65 WHIRLPOOL 6e950a294ec4bd1a7da44e42f9cee8448b5df3c17aeeb236f57a43b9e9356aef017cc5d6736c3a642ba47e00d32fb437bae06d5231f90d5401f59a573ed51299
 DIST genpatches-3.14-38.experimental.tar.xz 60312 SHA256 614694965a318ac8583883de8c66124e4318b1cfe6d1e0cb7b06fd98624be22b SHA512 957617ac3d3bcf40cfdc06a642db911478b525c7cadd96118dd4ac3ff4801a19c48dcfc5442b6ae4c4a196233ac3d8a020bd2326d30e0c270e3376fea10e6dbf WHIRLPOOL 5acd8a0512db3ed1d7dce001cd42d4a3f57abc4c09c52f2280793abefb3817145956f828682bbbcecb3beeb17766af39cbb41de623abc3a9b6dae9fc097bc862
 DIST genpatches-3.14-38.extras.tar.xz 18264 SHA256 45221d59d6e45f374a4ab289fdd35aaea7396736666cbecf9922cc6170d7578e SHA512 885944b1498ad48a78f73de78d95b19bc7daf042f6355412f846f9ce107d3f34d3f2f93acd531ed3b64937f02680ea5d83a3788f9412ba5806957b1095a37f9b WHIRLPOOL 409ff3b392658f5dfebd7e87a36f473f90f1f9c35d3b223d4c84cc25be231080eb5b9af63b770b239302e1cb1762f0303c1c81eed0105472d16473c0e3e2ae67
+DIST genpatches-3.14-40.base.tar.xz 837940 SHA256 25c67732d96507ee809bfa08dc3dcbe87edeceae9ba4650ac0634a98ae3e8211 SHA512 33f8008cf2ef439c42e085eb094f51b9ca70ef7e5c43c2584d756576eead77ac7ca6d10ff2c3ed6315ec1acc0e330e19e4f6f3dd53e488a70470dc3cd2ff1961 WHIRLPOOL d366581f7e2b4cb2ad806ffd3248c561e9e993ba2998a48b7c4a2f44ac8037d3943c052340f94517bbea23046b4c2fe5ddd00b41c8195fbf60f27f126069508f
+DIST genpatches-3.14-40.experimental.tar.xz 60336 SHA256 d9258d2746b61aeae69b939e38cf4ff563cadb0cc042676625da98a5c3b84623 SHA512 6a567fe55d2ea07d032ce298ae149cccc8e7d5c6664c89c2315a130beffccd1d36221a24ab95652cb6045cb5e7bd4a6ce17c63ca7039c81b4a45fb327609de59 WHIRLPOOL a90bd38cdb829cf0cc40bfa860c048a010623b60a08a7a330688015c342eec7826d17ca27b017687f536f6bec0b25d9a06d6081577470cfcadde8ed7d5a66e5e
+DIST genpatches-3.14-40.extras.tar.xz 18268 SHA256 842118f2712e9d34f0a890affb5805af9dbcaf4e7ee1c7b91ef95b265103b4ec SHA512 03b9198d993e506abe2b9224bdc8d0c82e9f579acdd8cdc5551752b585e1d0791eb6bcae5630bb64ea7719355c8eef207f9ad7e32357acb7e011bad1c3433605 WHIRLPOOL c0be863213e4586b98ffb19e3d5e8292f3bdb524ba335b805be1d83d2ae2133f0b773ef980e9cba8e46e3bc7e357525f38ae0a1becc8ee933db2fa6de5c2f976
 DIST genpatches-3.17-12.base.tar.xz 288464 SHA256 c39b1a6020d5e3edb044a5a5c9f7f0f9f776cf244260ba5e011798d956769e79 SHA512 9cf44048b44457a92bf07f65931f439a633166537d2c844188610862e064e052bf526e6f197cc2bbe0750f76dcc1ae10846e2b1c01935cfb33abfd2dbff85e0d WHIRLPOOL 0329fa44e6316bdef90f5490ad105fe8f5ac69048429092d4accbb63817b8b08b7d1cb899d2705c4a8bf61d798023d6a7a10400608706608e3c4872f1859bde6
 DIST genpatches-3.17-12.experimental.tar.xz 60316 SHA256 5f043d095be71df644b99d97a54fa452f8e254d7d068ff22b4ad70ccb229e16e SHA512 9899d8be29d2e805e622811910b131d41d24cda5504be563969ce65277f89c6ef52eb353225c434e64ecb648812cab3b15c06d73f1c46ae6223436eab02476e8 WHIRLPOOL b325aa25e984d5a3fcaf907dd562be2790e531c8469f8160fecc602088db8b2da66d85d80f5621f3edffdd906a2a75c7fa762109e1d693f38f1a12d5c2d5613b
 DIST genpatches-3.17-12.extras.tar.xz 16192 SHA256 47a9d6bea797fdd02d6ca5ac624931a8d0dfcb9639549519fe06c1e41f5b3333 SHA512 e771f938f2cb7af2157095c62a7cd81103264aec776deab896b3743e5f19e9a2d8b98130bb8017cc910882a5ad4f6c997a39a1e2139eee70874097a5085c6aba WHIRLPOOL 8973804df0bf07d95bc1ddcddea0b92adf1fd862ae76de0c2837bc4a86ea22acf8dce6def393dd9831e262e75d6c21ea59cf930e3b11b9b454825e631623a7f7
-DIST genpatches-3.18-8.base.tar.xz 197144 SHA256 f0e5072d15d07ee49b0493edb8b4557938ff8fb5ee01bc956726e8affe7ac25e SHA512 4545fb57df8d552b9c7137f6cdee0633e9b43c19739301417153813ade4085fc8e119ca4c96e9d39018ab47c1dd4239d023d00a14fcae2707bba4e100cdfc261 WHIRLPOOL a23625418fdabb6f518beff21c60a633906ab4c7d7b6f4cf599dae04bbc30801457d10046eb039c76fe60f8575150a312f11b9d8625f3e9369d72bf9615cc5a0
-DIST genpatches-3.18-8.experimental.tar.xz 60300 SHA256 b0a388bd4a07564578876d4aaf3ad40c48816c4148e142fd00cd1b9fd194e80e SHA512 506d67d5ccc2b0ea68dfcbf65aa520e4edc80f325ec11a65c1fee35c421f692a6ab96a91ff6ebedaffb9096bec8e02150e6fea33d6a4b646a01e4cabd8a217b5 WHIRLPOOL b8c9b7e2106673cb7e0b63afbba98391ea9dc4afc18a1fe8bf7c37117f685c5f90e0e5ff5484bee32f5526524fce58051011dc8e7165896195b566cae75e43c1
-DIST genpatches-3.18-8.extras.tar.xz 16188 SHA256 d0fe34ce244b6e972ac2f4e2ed3504a5b07c24adec98d55bc519c286bfdc69db SHA512 715226fbca053392f2f34f904f05b24777d065732f91a0f96a94cf8a34cc094e2d5e38c8f550b1eb00901f7746247c38ec07220ed677f372918e2d6e9ff55584 WHIRLPOOL 51bee769773d165fd4ac5b1d311c0332ae1102832079dc481115f00cfd9fd0feaa51594a00e8a9a18ca64a60a51c0f9de26c722253c747f4f714bbeac73520e4
-DIST genpatches-3.18-9.base.tar.xz 207580 SHA256 931fee6744642d052ce2d7e5324f904cefed9d62d1314d16a7dfbacee43bbef9 SHA512 dd156bcdee7b9f9dbd66ca0720743a2378ca4a828f867ab086d5e99d91618b375bf44e8e8796b6e2ca0db6c584f0c32135dc20b16a603f1c0bdf0605af978d5e WHIRLPOOL 6f1ae442d8b7bb8686f8dbff55d6bc2243a2073c32c246a8db1040e7c578d92d4e4fd313c15079a3e7c774ac0731939864e7804061a3a260c0e584bcb883ade7
-DIST genpatches-3.18-9.experimental.tar.xz 60316 SHA256 f6bf44847d8b9539e22d3d240b910aa9c47ada054001b88dafdd579ef8e25e84 SHA512 6897ab8deb506e941ed4974619db5372eed04b5e7539837f656db67091ec4492000686c0c5132a100b388f156a7d52b69e84f53548b6e641a17fbb735ecc11f6 WHIRLPOOL 7697a03f7fde3ff6aead775b691cc6b37925750b5a0b5bcef29b1afdfbe8b8efc30db2700351931a0ff6c1e07cfaf4f88bfb7573a078866aedf6588d2c4055cf
-DIST genpatches-3.18-9.extras.tar.xz 16180 SHA256 edd42f842d055068e19916955bd586da60b0a1cb6af954aac1505466ab469eb8 SHA512 6e4759a58cc61bddc9d703932e22c8db14c4b437b788bb0eee6aedb709bc8223e3621e853fc6dc51ba23309778e5633e6982af59fdd9bcbecfbedfa619ba006b WHIRLPOOL b76c94fd7ae178344c20e921153d568c9bcf220670d4c9130c53dec398be9e04ad7700d48e3f94dcc4da1b631f9e2831f0d7c3b29f98d66c9b75098aa3ecd358
+DIST genpatches-3.18-11.base.tar.xz 257480 SHA256 5c42cb7769ce03e8b234b1981b256ff53deac337191ab61a3c41ce37697dd2d1 SHA512 541ce106b66f52f422d02feb1fb1838959e5ea1041b1dc21773d599b382938ab95ce9d4a1c92cf75e474bf0b45e8d6b0add128c2c5982119a67c73887cb3c369 WHIRLPOOL c0e8a9478dea4424e4bce08c31b7fdd39c759965e034e966e88bdd74937013b1aab8189c2981063e1933304ff3cd4e1cc9c27383f5ccf6422d235b44aec61719
+DIST genpatches-3.18-11.experimental.tar.xz 61532 SHA256 0645955271dce8c653dd21716229ed46163fb1574ba5710e5b5753b0352bc925 SHA512 f60d297a9145e7dbaf241b5f68e392159201f9f6a4dd64d8f9679d6b5d0ffaff980eea5ba0085d1620e92c3f152f275201d0da67ca8264058813c8eb358799bd WHIRLPOOL ef36f610f4b3bbb541b6007238ac6b9200fe64324c1cb9336c15f2cb38ef6976a3c0a9954503fd338742531af7c177e1d9140870b49382f99aa2aec3c5a93e8f
+DIST genpatches-3.18-11.extras.tar.xz 16184 SHA256 576370ba1c6449b0ea04a5dfcc600f3971504ff03cb4b0a221601d533e5e6b5d SHA512 d4a477a6c7a5b69cf549c8f29f0b158ec642c7d9627ea1c41294900fd605936612cc6dd5de44bb9bee211b8f8c63207cbd22a7fb7e690fb2cdf735aff284bed1 WHIRLPOOL 1f63e754521d774708f22143f93ca7d85f13e7165433829c66c77931ebd4c7894c292df0413f22a617711ec55f1b75b380fbcbd493c585a6147453a77848bf5a
 DIST genpatches-3.19-1.base.tar.xz 3228 SHA256 f1cb186a18c9b075ebc38c179eb9306dd00600da8358d7f4ea6b434f4d4a10b4 SHA512 a128e78662896021940d6d87a61c0752ad5da4bd1fdfb0f8e784f3353bd6ed3f46ba34632ccdd34ac2526861226e829f63a253a0b28e0b5a373e0b1b27d49ccf WHIRLPOOL 364d8b04724b5e9528a68bb328329a9b73f88e43aa5015f92a008da4718ce9a635b4a2b51a531b7d58355ea96762d575e14b7c7a3087ac61aabb2cc19b541409
 DIST genpatches-3.19-1.experimental.tar.xz 3556 SHA256 4636fb56a98deba14d296b2b8f87edc17deb396a0ab4cdebbb1c888a00a49316 SHA512 6d764929ee05d7a4a4139675f9f5beff41e2313031b10a570473b7676679e9bf83636cb5a221d04a303a32912f821e760c738a75b22808b039339fcd188920b3 WHIRLPOOL a1bbb0b8d44e747b239a66602dfc25e425c8e9881a886f199d8e9c0a0e33010ed5aa11d9f9e0a6a6e7600b294f23d4dba90493b8d59bffb869e8a5c362284ac2
 DIST genpatches-3.19-1.extras.tar.xz 1456 SHA256 63959517328e3266a0e27044b1611fe7d3a9ac69e43e806b468ff45b05407036 SHA512 1340c63dab494766fb458b5a8c7982693d483b00c83f9a40c97f4754c5f64db94987f73997c89f00d302654d4376f21f94c858e594a51fb2257a15ec30378a4f WHIRLPOOL 02a3349b0c77f5fc4fdab9c5c5fb20f100039e0cd03c3fc2bcdc3f2adc99d0b46e0941696b3fd6f28ca07ebfc300f888f4649a0e964dc02314ac5417d71bc47e
+DIST genpatches-3.19-2.base.tar.xz 63824 SHA256 5eeae4cedfd2716e74dd71ad3ebe0a898be2127aa56fbe6ca32be39af3ab939f SHA512 ebfd2b5ff4a2665a05f7cda15a691c8f8e06b1fb44eaa350d1d0024b0f292104272c9f0be45f05311fd7df1d2345786b92e9dcd92a8b0a5941ae3eebe4d05420 WHIRLPOOL b4c06de34114a353daf2ae15e6b6127ba59d0d67aa08673eda4e1dc7c4cc98eb480186a9da9eac71e0b071f7821a9b3b1377a1440af3e0b52ca2566e65898eaf
+DIST genpatches-3.19-2.experimental.tar.xz 61548 SHA256 78987ec65196b94f9e7592d5655929cfd5acece2025636cc3213d368315539af SHA512 948f6f41ece562a5143e22d2ef01c7b6c499b782a5e62ff00b28f3adaa4a1490494c585524f825f37304193381937a29c891b02c3b5194cbf296cfb25a78a4cf WHIRLPOOL cea187e13d40e1dca8250eb50a13ccf1b45e8e0976972f7570b89f44b1d42eec738869fcac92f766892cd6d145ce105a4dc9264b1e75767c5ad1df7a8454439a
+DIST genpatches-3.19-2.extras.tar.xz 16212 SHA256 d481a4cfcd757013512e132872176504464c4f2db8a2d9b1ae2a68dbaec22299 SHA512 b3c5cbdbd0184e04b8d763485a34d1865e109260038f071956bd2aa11a66fb65b0cdc01cf83df9471a1f56316e35e816a928bf0727d6b36b8f28299092f9c62a WHIRLPOOL 64065acc2254c4d68d18fa4463db2f3a5ff736c1643a43b12b90c50c828f86b8b00752eb5541f01c64c64b255be50e520717f7004a394bd23660fa5e1c1dec23
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.17.tar.xz 80333152 SHA256 f5153ec93c5fcd41b247950e6a9bcbc63fa87beafd112c133a622439a0f76251 SHA512 29c99764e371f7005dbbe2bbe4458b4deeae5297da7e5b719b0f29f6f018629338b608369162ae6bd76bec4d8719cf491257ac57fdd5277cce8941b7f90246a0 WHIRLPOOL 4b0ba9d997f28a317991287160c91c4e4f2245d7e08c7cb9691f67c3838bddb3ab8048b01e841e6659eceb94a269b6bde32f4ca521d999593d0e9473c8559b46
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.7-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.35.ebuild
similarity index 95%
rename from sys-kernel/aufs-sources/aufs-sources-3.18.7-r1.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.14.35.ebuild
index d8d8ea96fee4..3c5bb5897cd9 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.7-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.35.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.18.7-r1.ebuild,v 1.1 2015/02/13 10:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.35.ebuild,v 1.1 2015/03/09 08:07:38 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
+K_GENPATCHES_VER="40"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
 detect_version
 detect_arch
 
-AUFS_VERSION=3.18.1+_p20150126
+AUFS_VERSION=3.14.21+_p20150309
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.32.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild
similarity index 95%
rename from sys-kernel/aufs-sources/aufs-sources-3.14.32.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild
index 14a1faad2c44..133d026b4f85 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.32.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.32.ebuild,v 1.1 2015/02/07 08:28:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild,v 1.1 2015/03/09 08:07:38 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="37"
+K_GENPATCHES_VER="11"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
 detect_version
 detect_arch
 
-AUFS_VERSION=3.14.21+_p20150126
+AUFS_VERSION=3.18.1+_p20150309
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.6-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.19.1.ebuild
similarity index 95%
rename from sys-kernel/aufs-sources/aufs-sources-3.18.6-r1.ebuild
rename to sys-kernel/aufs-sources/aufs-sources-3.19.1.ebuild
index a61bae53aa21..660466d94bcc 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.6-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.19.1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.18.6-r1.ebuild,v 1.1 2015/02/13 10:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.19.1.ebuild,v 1.1 2015/03/09 08:07:38 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="8"
+K_GENPATCHES_VER="2"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
 detect_version
 detect_arch
 
-AUFS_VERSION=3.18.1+_p20150126
+AUFS_VERSION=3.19_p20150309
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index f4a860b29997..1651c26187d0 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,3 +1,4 @@
 DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c WHIRLPOOL 76a17bb3d7c30cee19e135940f3607106efb2984061f946f0da9a2ddd602dc1bfc7e6f8970975cfb113d13f23a75415f39938204af266e2819e7a239b6f46778
 DIST patch-4.0-rc1.xz 4892656 SHA256 1aa6b583fc03bc4142a9e4731d0ae3b8d090a468e2f26d46137fd4ec7f8c1714 SHA512 ea873f3c3f79b15986726f24445746f05ae2c7f89b47287c7cf8cf55f72a9e1071f3eacaa5ef3f4e06a424069c65baf559a161a33cb2978f82e1a8f39b56479e WHIRLPOOL c443f4c938badd30338dbe7376dd15acfb89a1b04c16097ef5b7f6d165d3f30bde4ade4d6bd2241074e834cfa1747041aeb3bc4893effcea2c14bd04aab21709
 DIST patch-4.0-rc2.xz 4915296 SHA256 d5a9e27e98b0771f6d082d5d323eecc0094ecc84d6f181c5de3f1c02498caa51 SHA512 f2d8e8b5a2890009d22fc203f701b0be9f58ee72e1c17d4d9501bd2dc650947ec039af6588eaab5683a839fcca8371b64d4f98a73dcf6b8133d5b2a12da077b8 WHIRLPOOL 141d76a56d3311a7d0b7d1e191f5d0fb15ad830697e9a1650b805cf1e45bae6c9be2ae5a6215391c008f76a8f615c512597b2db7890516c28f7971541bc3491b
+DIST patch-4.0-rc3.xz 4982656 SHA256 6f0fcbf6fc56ef49e04dd9cf7e0f50e6feed37a89cacf175ccdb5a00a3568f03 SHA512 7739d6a16a38303b1d8e8160517cd8bdeaebd4640658a37f9f2e710e6daa00d0bd9e7db9c9cf9eec14e3b8bde87a224293b80fd9dd4d6923f14635173b3867c1 WHIRLPOOL d91ab7ed1625f730de5a796437d9da1085ca84cc2b4fcea9b3bcd16f655df88dc824c88abdd95e8a9dc5bc2ba8078b13a8341024e2d42477f6df8aa6cd04d577
diff --git a/sys-kernel/git-sources/git-sources-4.0_rc3.ebuild b/sys-kernel/git-sources/git-sources-4.0_rc3.ebuild
new file mode 100644
index 000000000000..0a28e8358dd2
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.0_rc3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-4.0_rc3.ebuild,v 1.1 2015/03/09 08:46:21 mpagano Exp $
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_DEBLOB_AVAILABLE=0
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/virtual/python-futures/python-futures-0.ebuild b/virtual/python-futures/python-futures-0.ebuild
index 4fc03a760896..745a477114d7 100644
--- a/virtual/python-futures/python-futures-0.ebuild
+++ b/virtual/python-futures/python-futures-0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-futures/python-futures-0.ebuild,v 1.5 2015/03/06 22:43:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-futures/python-futures-0.ebuild,v 1.6 2015/03/09 00:02:58 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/www-apps/owncloud/owncloud-8.0.0.ebuild b/www-apps/owncloud/owncloud-8.0.0.ebuild
index b8f8e2a5b426..d767c2a1532e 100644
--- a/www-apps/owncloud/owncloud-8.0.0.ebuild
+++ b/www-apps/owncloud/owncloud-8.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.0.ebuild,v 1.1 2015/02/09 16:00:14 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-8.0.0.ebuild,v 1.2 2015/03/09 16:58:58 voyageur Exp $
 
 EAPI=5
 
@@ -44,3 +44,10 @@ src_install() {
 
 	webapp_src_install
 }
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-client/phantomjs/phantomjs-1.9.8.ebuild b/www-client/phantomjs/phantomjs-1.9.8.ebuild
index ea057742896e..9ff258bf8679 100644
--- a/www-client/phantomjs/phantomjs-1.9.8.ebuild
+++ b/www-client/phantomjs/phantomjs-1.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.8.ebuild,v 1.2 2015/03/06 22:46:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/phantomjs/phantomjs-1.9.8.ebuild,v 1.3 2015/03/09 00:04:56 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/ariya/phantomjs/downloads/${P}-source.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/icu:=
diff --git a/www-servers/tornado/tornado-3.1.1-r1.ebuild b/www-servers/tornado/tornado-3.1.1-r1.ebuild
index b46027ea77e1..3bffcfeccc19 100644
--- a/www-servers/tornado/tornado-3.1.1-r1.ebuild
+++ b/www-servers/tornado/tornado-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.1.1-r1.ebuild,v 1.8 2015/03/07 08:27:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.1.1-r1.ebuild,v 1.9 2015/03/09 00:04:47 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="curl test"
 
 RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep python2_7)] )"
diff --git a/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild b/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild
index e8a0f5393aea..bda9275f48bb 100644
--- a/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild
+++ b/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild,v 1.1 2015/01/29 17:04:48 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild,v 1.2 2015/03/09 14:47:43 chithanh Exp $
 
 EAPI=5
 
@@ -12,5 +12,6 @@ SRC_URI="http://xorg.freedesktop.org/releases/individual/driver/${P}.tar.xz"
 KEYWORDS="~arm"
 IUSE=""
 
-RDEPEND="x11-libs/libdrm[video_cards_tegra]"
+RDEPEND="x11-libs/libdrm[video_cards_tegra]
+	>=x11-base/xorg-server-1.13"
 DEPEND="${RDEPEND}"
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 64d4b159b7c7..17f503f9f4a0 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -3,4 +3,5 @@ DIST synergy-1.5.0-r2278-Source.tar.gz 4350894 SHA256 66bf6016a2e71b2b2b26fc445d
 DIST synergy-1.5.1-r2398-Source.tar.gz 4350720 SHA256 c70cc5bbec47ea22bdc34107a1788cc37143c0fd8d8c4affba4f0257c26408a7 SHA512 793d502955a035b9032713ffbfa136328994f03a8d84000de1f062c56ce172d6e8667243a3aa728d9646760c5d54a56d9a1b75f7ea11e7e28b50e2793d6db633 WHIRLPOOL 7f9d893a0d2cfa8c5aeab948f22ad5730507b7007bf013b0916b36b392859b328a635dd7d7e196246cd634c6de410235d0e38037d860b00856d86128c47801a0
 DIST synergy-1.6.1.tar.gz 4404494 SHA256 7cd07198f70511f8555bf6e4520c118522a89b4ab6c6af96f1547f254bba0257 SHA512 b71102ca1e6f9bbcaf4b904287cdbaa73bfa18dc1ab54fb3e01a8ea23ba508e4e49924ba1cd2c76805882cafd059bac406509508171981c0a9b91e5711f1960a WHIRLPOOL 4dd17cdbe0fb9b7ebb6d5630528894c94c56930aac1c5eafe34833e56517fe687da31f65648fc804dfb03214a366c605a16ad3f0fce805aabac69372393ccf7b
 DIST synergy-1.6.2.tar.gz 4411385 SHA256 36c0a2c9ea1c3a13a6134ce1e76ad8dd2f442100dd6075c53f31b399d2543ba3 SHA512 197b399a96177ab8f493bdea439dffb1d153d120fc102dd66518681c5af7ec35f526f4c8a76efad36fe46f6fd9d332feb0d38ae969d5fd2bb6653fd8731ff11e WHIRLPOOL 76c9684489e7f9d42d2d1685e248ce3d57693b0c57dd5cd7cf8e0d827982c13546f00bfcbe4f7e88082c67659c69e5a841f640bb66a07560ac11d467095f60f4
+DIST synergy-1.7.0.tar.gz 8990045 SHA256 7f51c0e8ed76aec7fb14a02592248e807cb068913e154abf4ce7e326053ef4c0 SHA512 29c8c2f4d4784a45503332684f9217483f40df0ee4ee371e80411a21679234c7d34a4ada73fd4ba2218b39a9976943e8eed082152e7ef353eafeeea6bed73363 WHIRLPOOL 082944bbdc0571a1fd8c61db5c8f92b17e0f5266481b8187781d6590473c801b43b2dc08fd845876bc7ad8660a8bb739cb9347cec3d455d36230f91f58897721
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
diff --git a/x11-misc/synergy/synergy-1.7.0.ebuild b/x11-misc/synergy/synergy-1.7.0.ebuild
new file mode 100644
index 000000000000..c76549b335fb
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.7.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.7.0.ebuild,v 1.1 2015/03/09 11:15:41 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="http://synergy-project.org/ https://github.com/synergy/synergy"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="qt4 test"
+
+COMMON_DEPEND="
+	>=dev-libs/crypto++-5.6.2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-cpp/gmock-1.6.0 )
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	qt4? ( !x11-misc/qsynergy )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.16_p1969-pthread.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-test.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-CSocketMultiplexer.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST)
+	cmake-utils_src_configure
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_compile
+	fi
+}
+
+src_test() {
+	local exe fail
+	for exe in bin/integtests bin/unittests; do
+		${exe} || fail+=" ${exe}"
+	done
+	[[ ${fail} ]] && ewarn "${fail} failed"
+}
+
+src_install () {
+	dobin bin/${PN}{c,s}
+
+	if use qt4 ; then
+		newbin bin/${PN} qsynergy
+		newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
+		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
+	fi
+
+	insinto /etc
+	newins doc/synergy.conf.example synergy.conf
+
+	newman doc/${PN}c.man ${PN}c.1
+	newman doc/${PN}s.man ${PN}s.1
+
+	dodoc README doc/synergy.conf.example* ChangeLog
+}
+
+pkg_preinst() {
+	use qt4 && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use qt4 && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use qt4 && gnome2_icon_cache_update
+}